C13,C12编码调整为RO3,R04

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

@@ -1227,7 +1227,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         List<WithdrawLabelInfo> list = agmsFortuneDalService.salaryPolicyNoDetails(info);
         List<WithdrawLabelInfo> list = agmsFortuneDalService.salaryPolicyNoDetails(info);
         if(null != list && list.size() >0){
         if(null != list && list.size() >0){
             for(WithdrawLabelInfo withdrawLabelInfo : list){
             for(WithdrawLabelInfo withdrawLabelInfo : list){
-                if ("C01,C02,C03,C04,C05,C08,C11,C13,C14,C15,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
+                if ("C01,C02,C03,C04,C05,C08,C11,R03,C14,C15,R02,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
                     Commission commission = new Commission();
                     Commission commission = new Commission();
                     commission.setCommission(withdrawLabelInfo.getReferralAmount().doubleValue());//佣金
                     commission.setCommission(withdrawLabelInfo.getReferralAmount().doubleValue());//佣金
                     commission.setCustomer(withdrawLabelInfo.getInsurerName());//保险公司
                     commission.setCustomer(withdrawLabelInfo.getInsurerName());//保险公司
@@ -1244,10 +1244,14 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     commission.setSalestaff(withdrawLabelInfo.getPractitionerName());//经纪人名称
                     commission.setSalestaff(withdrawLabelInfo.getPractitionerName());//经纪人名称
                     commission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
                     commission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
                     commission.setCalculationAmount(withdrawLabelInfo.getCalculationAmount().doubleValue());
                     commission.setCalculationAmount(withdrawLabelInfo.getCalculationAmount().doubleValue());
-                    //C02:续年度直接销售佣金;C03:续年度销售加码奖金;C04:月度销售加码奖金; 没有orderid
+                    //C02:续年度直接销售佣金,新基本法;C03:续年度销售加码奖金;C04:月度销售加码奖金; 没有orderid,R02:续年度直接销售佣金(旧基本法
                     if ("C02".equals(withdrawLabelInfo.getDropOptionCode())) {
                     if ("C02".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c02List.add(commission);
                         c02List.add(commission);
                     }
                     }
+                    //R02:续年度直接销售佣金(旧基本法
+                    if ("R02".equals(withdrawLabelInfo.getDropOptionCode())) {
+                        c02List.add(commission);
+                    }
                     if ("C03".equals(withdrawLabelInfo.getDropOptionCode())) {
                     if ("C03".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c03List.add(commission);
                         c03List.add(commission);
                     }
                     }
@@ -1269,7 +1273,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     if ("C11".equals(withdrawLabelInfo.getDropOptionCode())) {
                     if ("C11".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c11List.add(commission);
                         c11List.add(commission);
                     }
                     }
-                    if ("C13".equals(withdrawLabelInfo.getDropOptionCode())) {
+                    //C13 改成 R03
+                    if ("R03".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c13List.add(commission);
                         c13List.add(commission);
                     }
                     }
                     if ("C14".equals(withdrawLabelInfo.getDropOptionCode())) {
                     if ("C14".equals(withdrawLabelInfo.getDropOptionCode())) {
@@ -1287,8 +1292,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     }
                     }
                 }
                 }
 
 
-                //C07:间接辅导岗位津贴;C06:直接辅导岗位津贴;C09:育成奖金; 被育成体系的所有保单;C10:团队长辅导津贴 C12:续年度绩效奖金
-                if ("C06,C07,C09,C10,C12,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
+                //C07:间接辅导岗位津贴;C06:直接辅导岗位津贴;C09:育成奖金; 被育成体系的所有保单;C10:团队长辅导津贴 C12:续年度绩效奖金( C12改成R04)
+                if ("C06,C07,C09,C10,R04,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
                     RenewalYearPerformanceCommission renewalYearPerformanceCommission = new RenewalYearPerformanceCommission();
                     RenewalYearPerformanceCommission renewalYearPerformanceCommission = new RenewalYearPerformanceCommission();
                     renewalYearPerformanceCommission.setComments(withdrawLabelInfo.getRemark());
                     renewalYearPerformanceCommission.setComments(withdrawLabelInfo.getRemark());
                     renewalYearPerformanceCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount()));
                     renewalYearPerformanceCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount()));
@@ -1320,7 +1325,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     if ("C10".equals(withdrawLabelInfo.getDropOptionCode())) {
                     if ("C10".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c10List.add(renewalYearPerformanceCommission);
                         c10List.add(renewalYearPerformanceCommission);
                     }
                     }
-                    if ("C12".equals(withdrawLabelInfo.getDropOptionCode())) {
+                    if ("R04".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c12List.add(renewalYearPerformanceCommission);
                         c12List.add(renewalYearPerformanceCommission);
                     }
                     }