增加保存-发佣状态为不可发,暂存时增加批次保存

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java

@@ -131,7 +131,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
             canPaymentUpDate(paymentStatus,payoutBatchId,loginId,customerFortunes);
             canPaymentUpDate(paymentStatus,payoutBatchId,loginId,customerFortunes);
         }else {
         }else {
             //如paymentStatus != 2(暂不可发,保留),只需统计原Fortune对应的Withdraw,重新计算
             //如paymentStatus != 2(暂不可发,保留),只需统计原Fortune对应的Withdraw,重新计算
-            noPaymentUpDate(paymentStatus,payoutBatch,loginId,customerFortunes);
+            noPaymentUpDate(paymentStatus,payoutBatchId,loginId,customerFortunes);
         }
         }
 
 
         responseVO.setCommonResult(commonResult);
         responseVO.setCommonResult(commonResult);
@@ -271,7 +271,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
         return customerWithdrawMap;
         return customerWithdrawMap;
     }
     }
 
 
-    private void noPaymentUpDate(String paymentStatus,String payoutBatch, Long loginId, List<AclCustomerFortune> customerFortunes) {
+    private void noPaymentUpDate(String paymentStatus,Long payoutBatchId, Long loginId, List<AclCustomerFortune> customerFortunes) {
         System.out.println("noPaymentUpDate");
         System.out.println("noPaymentUpDate");
         //需要修改的fortune记录(需修改佣金发放状态)
         //需要修改的fortune记录(需修改佣金发放状态)
         List<AclCustomerFortune> fortuneUpdates = new ArrayList<>();
         List<AclCustomerFortune> fortuneUpdates = new ArrayList<>();
@@ -283,7 +283,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
                 fortune.setCommissionPayoutStatus(paymentStatus);
                 fortune.setCommissionPayoutStatus(paymentStatus);
                 fortune.setCommissionPayoutBy(loginId);
                 fortune.setCommissionPayoutBy(loginId);
                 fortune.setCommissionPayoutAt(new Date());
                 fortune.setCommissionPayoutAt(new Date());
-                fortune.setCommissionPayoutStatus(payoutBatch);
+                fortune.setPayoutBatchId(payoutBatchId);
                 Long withdrawId = fortune.getWithdrawedId();
                 Long withdrawId = fortune.getWithdrawedId();
                 fortune.setWithdrawedId(null);
                 fortune.setWithdrawedId(null);
                 fortune.setFortunePayedId(null);
                 fortune.setFortunePayedId(null);