xuqiang пре 1 година
родитељ
комит
2c8ae25ebd

+ 5 - 0
src/main/java/com/ydtech/modules/partner/model/vo/TeamOverviewVo.java

@@ -25,9 +25,14 @@ public class TeamOverviewVo {
 
     private Long zeroDays;
 
+    @ApiModelProperty(value = "解锁状态")
+    private boolean unlockedStatus;
+
     @ApiModelProperty(value = "购买保级金额")
     private BigDecimal fallAmount;
 
+    private Integer lockGrade;
+
     private Object vo1;
 
     private Object vo2;

+ 5 - 0
src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -285,8 +285,10 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         Map<Integer, PartnerUser> userMap = partnerUsers.stream()
                 .collect(Collectors.toMap(PartnerUser::getGrade, Function.identity()));
 
+        Integer max = baseMapper.selectMax(params.getUserId());
 
         for (TeamOverviewVo overviewVo : teamOverviewVos) {
+            overviewVo.setLockGrade(max);
             PartnerUser partnerUser = userMap.get(Integer.valueOf(overviewVo.getGrade()));
             switch (overviewVo.getGrade()){
                 case "1":
@@ -672,7 +674,9 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
                 .in(PartnerUser::getGrade, grades));
         Map<Integer, PartnerUser> userMap = partnerUsers.stream()
                 .collect(Collectors.toMap(PartnerUser::getGrade, Function.identity()));
+        Integer max = baseMapper.selectMax(params.getUserId());
         for (TeamOverviewVo overviewVo : teamOverviewVos) {
+            overviewVo.setLockGrade( max);
             JSONObject map = new JSONObject();
             map.put("grade",overviewVo.getGrade());
             map.put("gradeName",overviewVo.getGradeName());
@@ -742,6 +746,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         }
         boolean checked = partnerRuleService.verifyUpgradeConditions(partnerUser.getUserId(),String.valueOf(grade));
         overviewVo.setUpgradeStatus(checked ? 1 : 0);
+        overviewVo.setUnlockedStatus(overviewVo.getLockGrade() == partnerUser.getGrade());
         Long count = liftingRecordService.selectDowngradeRecord(partnerUser.getUserId(), partnerUser.getGrade(),1);
         if (count > 0){
             overviewVo.setUpgradeStatus(2);