C15体系推荐奖，来佣比对导出去重

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

@@ -1208,6 +1208,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         List<Commission> c03List = new ArrayList<>();
         List<Commission> c04List = new ArrayList<>();
         List<Commission> c05List = new ArrayList<>();
+        List<RecommendSystemCommission> c15List = new ArrayList<>();
         List<RenewalYearPerformanceCommission> c06List = new ArrayList<>();
         List<RenewalYearPerformanceCommission> c07List = new ArrayList<>();
         List<Commission> c08List = new ArrayList<>();
@@ -1226,7 +1227,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,C13,C14,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
+                if ("C01,C02,C03,C04,C05,C08,C11,C13,C14,C15,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
                     Commission commission = new Commission();
                     commission.setCommission(withdrawLabelInfo.getReferralAmount().doubleValue());//佣金
                     commission.setCustomer(withdrawLabelInfo.getInsurerName());//保险公司
@@ -1274,7 +1275,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                     if ("C14".equals(withdrawLabelInfo.getDropOptionCode())) {
                         c14List.add(commission);
                     }
-
+                    //体系推荐奖
+                    if ("C15".equals(withdrawLabelInfo.getDropOptionCode())) {
+                        RecommendSystemCommission recommendSystemCommission = new RecommendSystemCommission();
+                        recommendSystemCommission.setFYC_RYC(String.valueOf(withdrawLabelInfo.getFycAmount()));
+                        recommendSystemCommission.setRate(String.valueOf(withdrawLabelInfo.getCalculationRate()));
+                        recommendSystemCommission.setSaleSystem(withdrawLabelInfo.getSubordinateSystemName());
+                        recommendSystemCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount().doubleValue()));
+                        recommendSystemCommission.setComments(withdrawLabelInfo.getRemark());
+                        c15List.add(recommendSystemCommission);
+                    }
                 }
 
                 //C07:间接辅导岗位津贴;C06:直接辅导岗位津贴;C09:育成奖金; 被育成体系的所有保单;C10:团队长辅导津贴 C12:续年度绩效奖金
@@ -1353,8 +1363,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         responseBody.setDirecSalesAddWeightList(c14List);//直接销售加码佣金
         //7,推介奖金 C05 个人的有orderid
         responseBody.setRecommendCommissionList(c05List);
-        //8,体系推介奖金  C05 体系的的有orderid
-        responseBody.setRecommendSystemCommissionList(null);
+        //8,体系推介奖金  C15
+        responseBody.setRecommendSystemCommissionList(c15List);
         //9,特别管理奖金
         responseBody.setSpecialManagementCommissionList(null);
         responseBody.setFycMeritsInfoList(c08List);//C08 团队管理绩效达标奖金
@@ -1421,6 +1431,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         if ("C05".equals(commissionType)) {
             return "B-004";
         }
+        //C15:体系推荐奖金;
+        if ("C15".equals(commissionType)) {
+            return "B-005";
+        }
         //C06:直接辅导岗位津贴;
         if ("C06".equals(commissionType)) {
             return "B-008";

yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml

@@ -5,7 +5,7 @@
     <select id="queryComeCommissionList" parameterType="com.yd.api.commission.vo.lifecommission.QueryComeCommissionListRequestVO"
             resultType="com.yd.api.commission.vo.lifecommission.ComeCommissionVO">
         select
-                t.*,
+               distinct t.*,
                 i.name insurerName,
                 ib.branch_name insurerBranchName,
                 c.check_yearmonth checkDate,
@@ -353,4 +353,4 @@
             </when>
         </choose>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>