Skip to content

Y
yd-backend
Commit e1d629e6 by wenyang
Options

新基本法2024(薪资单增加C16原辅导人之体系推荐奖金)

parent 0bf181a7
Showing with 49 additions and 53 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
......@@ -1212,6 +1212,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
List<Commission> c04List = new ArrayList<>();
List<Commission> c05List = new ArrayList<>();
List<RecommendSystemCommission> c15List = new ArrayList<>();
List<RecommendSystemCommission> c16List = new ArrayList<>();
List<RenewalYearPerformanceCommission> c06List = new ArrayList<>();
List<RenewalYearPerformanceCommission> c07List = new ArrayList<>();
List<Commission> c08List = new ArrayList<>();
......@@ -1233,7 +1234,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,D01,D02,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
if ("C01,C02,C03,C04,C05,C08,C11,R03,C14,C15,C16,R02,D01,D02,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
Commission commission = new Commission();
commission.setCommission(withdrawLabelInfo.getReferralAmount().doubleValue());//佣金
commission.setCustomer(withdrawLabelInfo.getInsurerName());//保险公司
......@@ -1250,50 +1251,39 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
commission.setSalestaff(withdrawLabelInfo.getPractitionerName());//经纪人名称
commission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
commission.setCalculationAmount(withdrawLabelInfo.getCalculationAmount().doubleValue());
//C02:续年度直接销售佣金,新基本法;C03:续年度销售加码奖金;C04:月度销售加码奖金; 没有orderid,R02:续年度直接销售佣金(旧基本法
if ("C02".equals(withdrawLabelInfo.getDropOptionCode())) {
c02List.add(commission);
}
//R02:续年度直接销售佣金(旧基本法
if ("R02".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("R02".equals(withdrawLabelInfo.getDropOptionCode())) {
//R02:续年度直接销售佣金(旧基本法
c02List.add(commission);
}
if ("C03".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C03".equals(withdrawLabelInfo.getDropOptionCode())) {
c03List.add(commission);
}
if ("C04".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C04".equals(withdrawLabelInfo.getDropOptionCode())) {
c04List.add(commission);
}
//C01:直接销售拥金;
if ("C01".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C01".equals(withdrawLabelInfo.getDropOptionCode())) {
//C01:直接销售拥金;
c01List.add(commission);
}
//C05:推荐奖金; 个人的有orderid 团体的无
if ("C05".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C05".equals(withdrawLabelInfo.getDropOptionCode())) {
//C05:推荐奖金; 个人的有orderid 团体的无
c05List.add(commission);
}
//C08:团队管理绩效达标奖金; 当前经纪人体系的所有保单
if ("C08".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C08".equals(withdrawLabelInfo.getDropOptionCode())) {
//C08:团队管理绩效达标奖金; 当前经纪人体系的所有保单
c08List.add(commission);
}
if ("C11".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C11".equals(withdrawLabelInfo.getDropOptionCode())) {
c11List.add(commission);
}
//C13 改成 R03
if ("R03".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("R03".equals(withdrawLabelInfo.getDropOptionCode())) {
//C13 改成 R03
c13List.add(commission);
}
if ("C14".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C14".equals(withdrawLabelInfo.getDropOptionCode())) {
c14List.add(commission);
}
if ("D01".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("D01".equals(withdrawLabelInfo.getDropOptionCode())) {
d01List.add(commission);
}
if ("D02".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("D02".equals(withdrawLabelInfo.getDropOptionCode())) {
d02List.add(commission);
}
//体系推荐奖
if ("C15".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C15".equals(withdrawLabelInfo.getDropOptionCode()) || "C16".equals(withdrawLabelInfo.getDropOptionCode())) {
//体系推荐奖、原辅导人之体系推荐奖金
RecommendSystemCommission recommendSystemCommission = new RecommendSystemCommission();
recommendSystemCommission.setFYC_RYC(String.valueOf(withdrawLabelInfo.getFycAmount()));
recommendSystemCommission.setRate(String.valueOf(withdrawLabelInfo.getCalculationRate()));
......@@ -1311,12 +1301,14 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
recommendSystemCommission.setSalestaff(withdrawLabelInfo.getPractitionerName());//经纪人名称
recommendSystemCommission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
recommendSystemCommission.setCalculationAmount(withdrawLabelInfo.getCalculationAmount().doubleValue());
c15List.add(recommendSystemCommission);
if("C15".equals(withdrawLabelInfo.getDropOptionCode())){
c15List.add(recommendSystemCommission);
}else if("C16".equals(withdrawLabelInfo.getDropOptionCode())){
c16List.add(recommendSystemCommission);
}
}
}
//C07:间接辅导岗位津贴;C06:直接辅导岗位津贴;C09:育成奖金; 被育成体系的所有保单;C10:团队长辅导津贴 C12:续年度绩效奖金( C12改成R04)
if ("C06,C07,C09,C10,R04,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
}else if ("C06,C07,C09,C10,R04,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
//C07:间接辅导岗位津贴;C06:直接辅导岗位津贴;C09:育成奖金; 被育成体系的所有保单;C10:团队长辅导津贴 C12:续年度绩效奖金( C12改成R04)
RenewalYearPerformanceCommission renewalYearPerformanceCommission = new RenewalYearPerformanceCommission();
renewalYearPerformanceCommission.setComments(withdrawLabelInfo.getRemark());
renewalYearPerformanceCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount()));
......@@ -1325,7 +1317,6 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
renewalYearPerformanceCommission.setSaleSystem(withdrawLabelInfo.getSubordinateSystemName());
renewalYearPerformanceCommission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式
renewalYearPerformanceCommission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
renewalYearPerformanceCommission.setCustomer(withdrawLabelInfo.getInsurerName());//保险公司
renewalYearPerformanceCommission.setEffectiveDate(withdrawLabelInfo.getEffectiveStartDate());//生效时间
renewalYearPerformanceCommission.setInsurance_Cust(withdrawLabelInfo.getInsuredName());//投保人
......@@ -1335,27 +1326,19 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
renewalYearPerformanceCommission.setCalculationAmount(withdrawLabelInfo.getCalculationAmount().doubleValue());
renewalYearPerformanceCommission.setSalesCommissionRate(withdrawLabelInfo.getCommissionRate().doubleValue());
if ("C06".equals(withdrawLabelInfo.getDropOptionCode())) {
c06List.add(renewalYearPerformanceCommission);
}
if ("C07".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C07".equals(withdrawLabelInfo.getDropOptionCode())) {
c07List.add(renewalYearPerformanceCommission);
}
if ("C09".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C09".equals(withdrawLabelInfo.getDropOptionCode())) {
c09List.add(renewalYearPerformanceCommission);
}
if ("C10".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("C10".equals(withdrawLabelInfo.getDropOptionCode())) {
c10List.add(renewalYearPerformanceCommission);
}
if ("R04".equals(withdrawLabelInfo.getDropOptionCode())) {
}else if ("R04".equals(withdrawLabelInfo.getDropOptionCode())) {
c12List.add(renewalYearPerformanceCommission);
}
}
//C99:其他,C98:公司激励奖金,C97:其它税前加扣款,C96:加码奖金,C95:季度奖金,C94,银盾在线佣金
if ("C99,C94,C95,C96,C97,C98,S01,S03,D91,D92,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
}else if ("C99,C94,C95,C96,C97,C98,S01,S03,D91,D92,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) {
//C99:其他,C98:公司激励奖金,C97:其它税前加扣款,C96:加码奖金,C95:季度奖金,C94,银盾在线佣金
OtherCommission otherCommission = new OtherCommission();
otherCommission.setComments(withdrawLabelInfo.getRemark());
otherCommission.setCommissionName(withdrawLabelInfo.getCommissionType());
......@@ -1365,9 +1348,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
otherCommission.setCommission(String.valueOf(withdrawLabelInfo.getReferralAmount().doubleValue()));
otherCommissionLis.add(otherCommission);
}
}
}
//1,首年度销售佣金 C01
......@@ -1393,6 +1374,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
responseBody.setRecommendCommissionList(c05List);
//8,体系推介奖金 C15
responseBody.setRecommendSystemCommissionList(c15List);
responseBody.setRecommendSystemCommissionC16List(c16List);
//9,特别管理奖金
responseBody.setSpecialManagementCommissionList(null);
responseBody.setFycMeritsInfoList(c08List);//C08 团队管理绩效达标奖金
......@@ -1466,6 +1448,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
if ("C15".equals(commissionType)) {
return "B-005";
}
//C16:原辅导人之体系推荐奖金;
if ("C16".equals(commissionType)) {
return "B-016";
}
//C06:直接辅导岗位津贴;
if ("C06".equals(commissionType)) {
return "B-008";
......
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseBody.java
......@@ -34,6 +34,8 @@ public class SearchStaffSalaryDetailsResponseBody {
private List<RecommendSystemCommission> RecommendSystemCommissionList;
private List<RecommendSystemCommission> RecommendSystemCommissionC16List;
private List<FirstYearPerformanceCommission> FirstYearPerformanceCommissionList;
private List<RenewalYearPerformanceCommission> RenewalYearPerformanceCommissionList;//续年度绩效奖金
......@@ -154,6 +156,14 @@ public class SearchStaffSalaryDetailsResponseBody {
RecommendSystemCommissionList = recommendSystemCommissionList;
}
public List<RecommendSystemCommission> getRecommendSystemCommissionC16List() {
return RecommendSystemCommissionC16List;
}
@JsonProperty("RecommendSystemCommissionC16List")
public void setRecommendSystemCommissionC16List(List<RecommendSystemCommission> recommendSystemCommissionC16List) {
RecommendSystemCommissionC16List = recommendSystemCommissionC16List;
}
public List<FirstYearPerformanceCommission> getFirstYearPerformanceCommissionList() {
return FirstYearPerformanceCommissionList;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment