来佣比对加 “保留” 状态

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

@@ -484,9 +484,9 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
         paramMap.put("checkAt", new Date());
         paramMap.put("checkAt", new Date());
         paramMap.put("checkBy", loginId);
         paramMap.put("checkBy", loginId);
 
 
-        /**检核选择退保时先查看原来的来佣状态，若原来的是”已比对“则不改成已退保，若是”待来佣“就改成”已退保“*/
+        /**检核选择退保时先查看原来的来佣状态，若原来的是”已比对“则不改成已退保，若是“待来佣”和“保留”就改成”已退保“*/
         if ("3".equals(status)) {
         if ("3".equals(status)) {
-            if ("1".equals(order.getCommissionCheckStatus())) {
+            if (!"2".equals(order.getCommissionCheckStatus())) {
                 lifeCommissionMapper.setOrderCommissionCheckId(Arrays.asList(order.getId()), paramMap);
                 lifeCommissionMapper.setOrderCommissionCheckId(Arrays.asList(order.getId()), paramMap);
             }
             }
         } else {
         } else {
@@ -658,6 +658,8 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
             return "已比对";
             return "已比对";
         } else if ("3".equals(commissionCheckStatus)) {
         } else if ("3".equals(commissionCheckStatus)) {
             return "已退保";
             return "已退保";
+        } else if ("4".equals(commissionCheckStatus)) {
+            return "保留";
         } else {
         } else {
             return "";
             return "";
         }
         }