薪资单手工录入的数据，C005特殊处理下

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -1251,16 +1251,17 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 }
                 }
 
 
                 //C99:其他,C98:公司激励奖金,C97:其它税前加扣款,C96:加码奖金,C95:季度奖金,C94,银盾在线佣金
                 //C99:其他,C98:公司激励奖金,C97:其它税前加扣款,C96:加码奖金,C95:季度奖金,C94,银盾在线佣金
-                if ("C99,C94,C95,C96,C97,C98,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
+                if ("C99,C94,C95,C96,C97,C98,S01,S03,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
                     OtherCommission otherCommission = new OtherCommission();
                     OtherCommission otherCommission = new OtherCommission();
                     otherCommission.setComments(withdrawLabelInfo.getRemark());
                     otherCommission.setComments(withdrawLabelInfo.getRemark());
-                    otherCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount().doubleValue()));
                     otherCommission.setCommissionName(withdrawLabelInfo.getCommissionType());
                     otherCommission.setCommissionName(withdrawLabelInfo.getCommissionType());
                     otherCommission.setWithdrawedId(withdrawLabelInfo.getWithdrawId());
                     otherCommission.setWithdrawedId(withdrawLabelInfo.getWithdrawId());
                     otherCommission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式
                     otherCommission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式
                     otherCommission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
                     otherCommission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
+                    otherCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount().doubleValue()));
                     otherCommissionLis.add(otherCommission);
                     otherCommissionLis.add(otherCommission);
                 }
                 }
+
             }
             }
 
 
         }
         }
@@ -1297,7 +1298,32 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         //   * 12.加码奖金-》备注
         //   * 12.加码奖金-》备注
         //   * 13.季度奖金-》备注
         //   * 13.季度奖金-》备注
         //   * 14.银盾在线佣金-》H5
         //   * 14.银盾在线佣金-》H5
-        responseBody.setOtherCommissionList(otherCommissionLis);
+        List<OtherCommission> newOtherCommissionLis = new ArrayList<>();
+        Double c005Commission = 0.00;
+        String remark = "";
+        Long withdrawId = null;
+        if(null != otherCommissionLis && otherCommissionLis.size() > 1){
+             for(OtherCommission other:otherCommissionLis){
+                 if("C-005".equals(other.getSalaryCode())){
+                     c005Commission += Double.valueOf(other.getCommission());
+                     remark = other.getComments();
+                     withdrawId = other.getWithdrawedId();
+                 }else{
+                     newOtherCommissionLis.add(other);
+                 }
+             }
+        }
+        if(c005Commission > 0){
+            OtherCommission otherCommission = new OtherCommission();
+            otherCommission.setComments(remark);
+            otherCommission.setCommissionName("C-005");
+            otherCommission.setWithdrawedId(withdrawId);
+            otherCommission.setSalaryCode("银盾在线佣金");
+            otherCommission.setCommission(String.valueOf(c005Commission));
+            newOtherCommissionLis.add(otherCommission);
+        }
+
+        responseBody.setOtherCommissionList(newOtherCommissionLis);
         //C11 独立经纪人展业津贴
         //C11 独立经纪人展业津贴
         responseBody.setIndependentBrokerAllowanceList(c11List);
         responseBody.setIndependentBrokerAllowanceList(c11List);
 
 
@@ -1371,7 +1397,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             return "C-004";
             return "C-004";
         }
         }
         //银盾在线佣金
         //银盾在线佣金
-        if ("C94".equals(commissionType)) {
+        if ("C94".equals(commissionType) || "S01".equals(commissionType) || "S03".equals(commissionType)) {
             return "C-005";
             return "C-005";
         }
         }
         //C11:独立经纪人展业津贴
         //C11:独立经纪人展业津贴