渠道发佣报表12-预览薪资单，渠道服务费 D01 ,D02 加在 【个人销售】下

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

@@ -1221,6 +1221,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         List<RenewalYearPerformanceCommission> c12List =  new ArrayList<>();
         List<Commission> c13List =  new ArrayList<>();
         List<Commission> c14List = new ArrayList<>();
+        List<Commission> d01List =  new ArrayList<>();
+        List<Commission> d02List =  new ArrayList<>();
 
 
         List<OtherCommission> otherCommissionLis = new ArrayList<>();
@@ -1231,7 +1233,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         List<WithdrawLabelInfo> list = agmsFortuneDalService.salaryPolicyNoDetails(info);
         if(null != list && list.size() >0){
             for(WithdrawLabelInfo withdrawLabelInfo : list){
-                if ("C01,C02,C03,C04,C05,C08,C11,R03,C14,C15,R02,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
+                if ("C01,C02,C03,C04,C05,C08,C11,R03,C14,C15,R02,D01,D02,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
                     Commission commission = new Commission();
                     commission.setCommission(withdrawLabelInfo.getReferralAmount().doubleValue());//佣金
                     commission.setCustomer(withdrawLabelInfo.getInsurerName());//保险公司
@@ -1284,6 +1286,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     if ("C14".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c14List.add(commission);
                     }
+                    if ("D01".equals(withdrawLabelInfo.getDropOptionCode())) {
+                        d01List.add(commission);
+                    }
+                    if ("D02".equals(withdrawLabelInfo.getDropOptionCode())) {
+                        d02List.add(commission);
+                    }
                     //体系推荐奖
                     if ("C15".equals(withdrawLabelInfo.getDropOptionCode())) {
                         RecommendSystemCommission recommendSystemCommission = new RecommendSystemCommission();
@@ -1347,7 +1355,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 }
 
                 //C99:其他,C98:公司激励奖金,C97:其它税前加扣款,C96:加码奖金,C95:季度奖金,C94,银盾在线佣金
-                if ("C99,C94,C95,C96,C97,C98,S01,S03,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
+                if ("C99,C94,C95,C96,C97,C98,S01,S03,D91,D92,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
                     OtherCommission otherCommission = new OtherCommission();
                     otherCommission.setComments(withdrawLabelInfo.getRemark());
                     otherCommission.setCommissionName(withdrawLabelInfo.getCommissionType());
@@ -1517,7 +1525,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         if ("C14".equals(commissionType)) {
             return "A-006";
         }
-        return null;
+        return commissionType;
     }
 
     private void queryYdOnlineCommission(SearchStaffSalaryDetailsRequestBody requestVO, SearchStaffSalaryDetailsResponseBody responseBody) {