发佣检核13-手动增加来佣不能比对

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -159,7 +159,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
 
         try {
             // 1.检核续年佣金时先判断，前面期数的佣金是否检核过
-            this.validateContinuePremium(paramsList);
+//            this.validateContinuePremium(paramsList);
 
             // 2.更新财富等信息
             this.processOrderAndFortune(paramsList, status, loginId, checkBatch);
@@ -218,15 +218,17 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
         // 获取首年度佣金的orderId， 只有首年佣金才更新order记录和fortune记录
         List<Long> orderIds = new ArrayList<>();
         Long orderId;
-        for (ComeCommissionParams params: paramsList) {
+        for (ComeCommissionParams params : paramsList) {
             // 查询对应订单记录
             orderId = params.getOrderId();
+            if (orderId != null) {
                 PoOrder order = poOrderDALService.findByOrderId(orderId);
                 if ("1".equals(params.getCommissionPeriod())) {
                     orderIds.add(orderId);
                     // 只有首年记录更新order表
                     this.updateOrder(order, status, loginId, checkBatch);
                 }
+            }
             this.updateFortune(params.getCommissionId(), status, loginId, checkBatch);
         }
 
@@ -235,43 +237,37 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
             List<PoOrder> orders = poOrderDALService.findByIds(orderIds);
             this.orderCommissionCheckCancelSendMail(orders);
         }
-
     }
 
     private void updateOrderCommission(List<ComeCommissionParams> paramsList, String status, String loginId, String checkBatch) {
-
-        // 获取续年度来佣编号
-        List<String> commissionNos = new ArrayList<>();
-        for (ComeCommissionParams params: paramsList) {
-            if (StringUtils.isNotBlank(params.getCommissionNo())) {
-                commissionNos.add(params.getCommissionNo());
-            }
-        }
-
         // 获取批次号（如2020-11的字符串）
         Long checkBatchId = this.getOrderCommissionCheckBatch(checkBatch, loginId);
         Set<Long> commissionCancelorderIdSet = new HashSet<>();
         // 更新检核状态
-        for (String commissionNo: commissionNos) {
+        Long commissionId= null;
+        for (ComeCommissionParams params: paramsList) {
+            commissionId = params.getCommissionId();
             if ("3".equals(status)) {
                 // 来佣比对进行“已退保”操作时，当前状态为待来佣时才修改
-                AgPoOrderCommission agPoOrderCommission = orderCommissionMapper.selectByCommissionNo(commissionNo);
+                AgPoOrderCommission agPoOrderCommission = orderCommissionMapper.selectByPrimaryKey(commissionId);
                 if ("1".equals(agPoOrderCommission.getCommissionStatus())) {
                     AgPoOrderCommission orderCommission = new AgPoOrderCommission();
-                    orderCommission.setCommissionNo(commissionNo);
+                    orderCommission.setId(commissionId);
                     orderCommission.setCommissionCheckId(checkBatchId);
                     orderCommission.setCommissionStatus(status);
                     orderCommission.setCommissionTime("");
                     orderCommission.setUpdatedBy(Long.valueOf(loginId));
                     orderCommission.setUpdatedAt(new Date());
 
-                    orderCommissionMapper.updateBycommissionNo(orderCommission);
+                    orderCommissionMapper.updateByPrimaryKeySelective(orderCommission);
                     // 退保的orderId
+                    if (null != agPoOrderCommission.getOrderId()) {
                         commissionCancelorderIdSet.add(agPoOrderCommission.getOrderId());
                     }
+                }
             } else {
                 AgPoOrderCommission orderCommission = new AgPoOrderCommission();
-                orderCommission.setCommissionNo(commissionNo);
+                orderCommission.setId(commissionId);
                 orderCommission.setCommissionCheckId(checkBatchId);
                 orderCommission.setCommissionStatus(status);
                 if ("2".equals(status)) {
@@ -280,7 +276,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
                 orderCommission.setUpdatedBy(Long.valueOf(loginId));
                 orderCommission.setUpdatedAt(new Date());
 
-                orderCommissionMapper.updateBycommissionNo(orderCommission);
+                orderCommissionMapper.updateByPrimaryKeySelective(orderCommission);
             }
         }
         // 如果是已退保，将后续期数的待来佣记录都改为已退保
@@ -297,7 +293,7 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
                     orderCommission.setUpdatedBy(Long.valueOf(loginId));
                     orderCommission.setUpdatedAt(new Date());
 
-                    orderCommissionMapper.updateBycommissionNo(orderCommission);
+                    orderCommissionMapper.updateByPrimaryKeySelective(orderCommission);
                 }
             }
         }