代理人3.0app开发

src/main/java/com/ydtech/modules/partner/model/vo/TeamOverviewVo.java

@@ -33,6 +33,8 @@ public class TeamOverviewVo {
 
     private Integer lockGrade;
 
+    private boolean isLock;
+
     private Object vo1;
 
     private Object vo2;

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -318,13 +318,20 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
                         overviewVo.setLockCommission(liftingRecordService.queryLockCommission(partnerUser.getUserId(),overviewVo.getGrade()));
                         Long difference = calculateTimeDifference(partnerUser.getUserId(), partnerUser.getGrade());
                         overviewVo.setZeroDays(difference);
+                        BigDecimal lockCommission = liftingRecordService.queryLockCommission(partnerUser.getUserId(), String.valueOf(partnerUser.getGrade()));
                         PartnerRuleEntity rule = partnerRuleService.selectByGrade(overviewVo.getGrade());
-                        overviewVo.setFallAmount(rule.getFallAmount());
+                        if (null != lockCommission && null !=  rule.getFallAmount()){
+                            overviewVo.setFallAmount(lockCommission.multiply(rule.getFallAmount()).setScale(2, RoundingMode.HALF_UP));
+                        }else {
+                            overviewVo.setFallAmount(BigDecimal.ZERO);
+                        }
                         getRule(overviewVo, partnerUser);
                     }else {
                         overviewVo.setParentStatus("1");
                     }
                 }
+            }else {
+                overviewVo.setLock(true);
             }
         }
         homeVo.setTeamOverview(teamOverviewVos);
@@ -531,7 +538,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         if (account == null){
             account = new PartnerPartnerAccount();
         }else {
-            account.setCashFee(account.getExtractFee().subtract(account.getHistoryFee()));
+            account.setCashFee(account.getExtractFee().subtract(account.getHistoryFee()).subtract(account.getExpired()));
             if (partnerUser.isIdentityStatus()){
                 BigDecimal lockCommission = liftingRecordService.queryLockCommission(params.getUserId(), params.getGrade());
                 account.setFreeze(lockCommission);