202201:薪资单:新增C14-直接销售加码佣金

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

@@ -1158,6 +1158,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         List<Commission> c11List =  new ArrayList<>();
         List<Commission> c11List =  new ArrayList<>();
         List<RenewalYearPerformanceCommission> c12List =  new ArrayList<>();
         List<RenewalYearPerformanceCommission> c12List =  new ArrayList<>();
         List<Commission> c13List =  new ArrayList<>();
         List<Commission> c13List =  new ArrayList<>();
+        List<Commission> c14List = new ArrayList<>();
 
 
 
 
         List<OtherCommission> otherCommissionLis = new ArrayList<>();
         List<OtherCommission> otherCommissionLis = new ArrayList<>();
@@ -1167,7 +1168,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,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
+                if ("C01,C02,C03,C04,C05,C08,C11,C13,C14,".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());//保险公司
@@ -1211,6 +1212,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     if ("C13".equals(withdrawLabelInfo.getDropOptionCode())) {
                     if ("C13".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c13List.add(commission);
                         c13List.add(commission);
                     }
                     }
+                    if ("C14".equals(withdrawLabelInfo.getDropOptionCode())) {
+                        c14List.add(commission);
+                    }
+
                 }
                 }
 
 
                 //C07:间接辅导岗位津贴;C06:直接辅导岗位津贴;C09:育成奖金; 被育成体系的所有保单;C10:团队长辅导津贴 C12:续年度绩效奖金
                 //C07:间接辅导岗位津贴;C06:直接辅导岗位津贴;C09:育成奖金; 被育成体系的所有保单;C10:团队长辅导津贴 C12:续年度绩效奖金
@@ -1284,7 +1289,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         responseBody.setIndirectCounselingList(c07List);//间接辅导岗位津贴
         responseBody.setIndirectCounselingList(c07List);//间接辅导岗位津贴
         responseBody.setBreedingBonusList(c09List);//育成奖金
         responseBody.setBreedingBonusList(c09List);//育成奖金
         responseBody.setTLCoachingAllowanceList(c10List);//团队长辅导津贴
         responseBody.setTLCoachingAllowanceList(c10List);//团队长辅导津贴
-
+        responseBody.setDirecSalesAddWeightList(c14List);//直接销售加码佣金
         //7,推介奖金 C05 个人的有orderid
         //7,推介奖金 C05 个人的有orderid
         responseBody.setRecommendCommissionList(c05List);
         responseBody.setRecommendCommissionList(c05List);
         //8,体系推介奖金  C05 体系的的有orderid
         //8,体系推介奖金  C05 体系的的有orderid
@@ -1413,6 +1418,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         if ("C13".equals(commissionType)) {
         if ("C13".equals(commissionType)) {
             return "B-002";
             return "B-002";
         }
         }
+        //C14 直接销售加码佣金
+        if ("C14".equals(commissionType)) {
+            return "A-006";
+        }
         return null;
         return null;
     }
     }
 
 

yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseBody.java

@@ -49,7 +49,7 @@ public class SearchStaffSalaryDetailsResponseBody {
     private List<RenewalYearPerformanceCommission> TLCoachingAllowanceList;//团队长辅导津贴
     private List<RenewalYearPerformanceCommission> TLCoachingAllowanceList;//团队长辅导津贴
     private List<RenewalYearPerformanceCommission> breedingBonusList;//育成奖金
     private List<RenewalYearPerformanceCommission> breedingBonusList;//育成奖金
     private List<Commission> independentBrokerAllowanceList;//独立经纪人展业津贴
     private List<Commission> independentBrokerAllowanceList;//独立经纪人展业津贴
-
+    private List<Commission> direcSalesAddWeightList;//直接销售加码佣金
 
 
 
 
 
 
@@ -240,4 +240,12 @@ public class SearchStaffSalaryDetailsResponseBody {
     public void setIndependentBrokerAllowanceList(List<Commission> independentBrokerAllowanceList) {
     public void setIndependentBrokerAllowanceList(List<Commission> independentBrokerAllowanceList) {
         this.independentBrokerAllowanceList = independentBrokerAllowanceList;
         this.independentBrokerAllowanceList = independentBrokerAllowanceList;
     }
     }
+
+    public List<Commission> getDirecSalesAddWeightList() {
+        return direcSalesAddWeightList;
+    }
+
+    public void setDirecSalesAddWeightList(List<Commission> direcSalesAddWeightList) {
+        this.direcSalesAddWeightList = direcSalesAddWeightList;
+    }
 }
 }