Merge remote-tracking branch 'origin/dev_20210330' into dev_20210330

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

@@ -363,18 +363,24 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
     private void updateFortune(Long commissionId, String status, String loginId, String checkBatch) {
         // 查询对应的fortune记录
         List<AclCustomerFortune> fortuneList = customerFortuneDalService.queryLifeFortuneListByCommissionId(commissionId);
-
         // 更新fortune记录是否可发放
-        String fortuneCommissionPayoutStatus = "2".equals(status) ? "2" : "0";//旧发佣检核状态字段
+        String fortuneCommissionPayoutStatus = "0";//旧发佣检核状态字段
+        if ("1".equals(status)) {
+            fortuneCommissionPayoutStatus = "0";
+        } else if ("2".equals(status))  {
+            fortuneCommissionPayoutStatus = "2";
+        } else if ("3".equals(status))  {
+            fortuneCommissionPayoutStatus = "1";
+        }
 
         if (fortuneList.size() > 0) {
             // 批量设置fortune为可发佣
-            fortuneList.forEach(f -> {
+            for (AclCustomerFortune f : fortuneList) {
                 f.setCommissionPayoutStatus(fortuneCommissionPayoutStatus);
-                f.setStatus("2".equals(fortuneCommissionPayoutStatus) ? "2" : "1");//新发佣检核状态字段
+                f.setStatus("3".equals(status) ? "0" : status);//新发佣检核状态字段
                 f.setCommissionPayoutAt(new Date());
                 f.setCommissionPayoutBy(Long.valueOf(loginId));
-            });
+            }
             customerFortuneDalService.updateBatch(fortuneList);
         }
     }

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -98,7 +98,7 @@
         LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id  
         LEFT JOIN ag_md_drop_options op1 ON op1.id = setting.practitioner_level
         LEFT JOIN ag_md_drop_master mas1 ON mas1.id = op1.drop_master_id
-        WHERE t.settlement_type = '1' AND t.status != '4'
+        WHERE t.settlement_type = '1'
         AND mas.drop_code = 'Fortune_Payout_Status'
         AND mas1.scenario_code = 'practitioner_level'
         AND oc.commission_status = '2'
@@ -161,7 +161,7 @@
         LEFT JOIN ag_md_drop_master mas ON mas.id = op.drop_master_id  
         LEFT JOIN ag_md_drop_options op1 ON op1.id = setting.practitioner_level
         LEFT JOIN ag_md_drop_master mas1 ON mas1.id = op1.drop_master_id   
-        WHERE t.settlement_type = '2' AND t.status != '4'
+        WHERE t.settlement_type = '2'
         AND mas.drop_code = 'Fortune_Payout_Status'
         AND mas1.scenario_code = 'practitioner_level'
         and setting.practitioner_type_id = 28