代理人app开发

src/main/java/com/ydtech/modules/partner/utils/TimedTaskUtils.java

@@ -67,9 +67,9 @@ public class TimedTaskUtils {
             if (null ==  account){
                 continue;
             }
-            PartnerExpiredCommission commission = getExpiredCommission(record, account);
-            expiredCommissionMapper.insert(commission);
             BigDecimal lockCommission = liftingRecordService.queryLockCommission(record.getUserId(), record.getOriginalLevel());
+            PartnerExpiredCommission commission = getExpiredCommission(record,lockCommission);
+            expiredCommissionMapper.insert(commission);
             if (null != lockCommission){
                 account.setExpiredAmount(account.getExpiredAmount().add(lockCommission));
                 accountMapper.updateById(account);
@@ -84,7 +84,7 @@ public class TimedTaskUtils {
 
     }
 
-    private static PartnerExpiredCommission getExpiredCommission(PartnerLiftingRecord record, PartnerPartnerAccount account) {
+    private static PartnerExpiredCommission getExpiredCommission(PartnerLiftingRecord record, BigDecimal lockCommission) {
         PartnerExpiredCommission commission = new PartnerExpiredCommission();
         commission.setName(record.getName());
         commission.setMobile(record.getMobile());
@@ -93,7 +93,7 @@ public class TimedTaskUtils {
         commission.setDeptName(record.getDeptName());
         commission.setGrade(record.getOriginalLevel());
         commission.setGradeAfter(record.getAfterChange());
-        commission.setLockCommission(account.getCashFee());
+        commission.setLockCommission(lockCommission);
         commission.setDowngradeTime(record.getCreateTime());
         commission.setExpiration(new Date());
         commission.setCreateTime(new Date());