Skip to content

Y
yd-backend
Commit 4d5f32e0 by hongzhong
Options

薪资单明细调整

parent 1b0b415f
Showing with 212 additions and 13 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
...@@ -1126,11 +1126,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -1126,11 +1126,16 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
//所有的数据都从银盾获取 //所有的数据都从银盾获取
private void queryYdSalaryDetails(SearchStaffSalaryDetailsRequestBody requestVO, SearchStaffSalaryDetailsResponseBody responseBody) { private void queryYdSalaryDetails(SearchStaffSalaryDetailsRequestBody requestVO, SearchStaffSalaryDetailsResponseBody responseBody) {
List<Commission> c01List = new ArrayList<>(); List<Commission> c01List = new ArrayList<>();
List<Commission> c020304List = new ArrayList<>(); List<Commission> c02List = new ArrayList<>();
List<Commission> c03List = new ArrayList<>();
List<Commission> c04List = new ArrayList<>();
List<Commission> c05List = new ArrayList<>(); List<Commission> c05List = new ArrayList<>();
List<RenewalYearPerformanceCommission> c06070910List = new ArrayList<>(); List<RenewalYearPerformanceCommission> c06List = new ArrayList<>();
List<OtherCommission> otherCommissionLis = new ArrayList<>(); List<RenewalYearPerformanceCommission> c07List = new ArrayList<>();
List<Commission> c08List = new ArrayList<>(); List<Commission> c08List = new ArrayList<>();
List<RenewalYearPerformanceCommission> c09List = new ArrayList<>();
List<RenewalYearPerformanceCommission> c10List = new ArrayList<>();
List<OtherCommission> otherCommissionLis = new ArrayList<>();
WithdrawQueryInfo info = new WithdrawQueryInfo(); WithdrawQueryInfo info = new WithdrawQueryInfo();
info.setPractitionerId(requestVO.getPractitionerId()); info.setPractitionerId(requestVO.getPractitionerId());
...@@ -1149,12 +1154,20 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -1149,12 +1154,20 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
commission.setPolicyno(withdrawLabelInfo.getPolicyNo());//保单号 commission.setPolicyno(withdrawLabelInfo.getPolicyNo());//保单号
commission.setRate(withdrawLabelInfo.getFycRate().intValue());//职佣率 commission.setRate(withdrawLabelInfo.getFycRate().intValue());//职佣率
commission.setSalesCommissionRate(withdrawLabelInfo.getCommissionRate().doubleValue()); commission.setSalesCommissionRate(withdrawLabelInfo.getCommissionRate().doubleValue());
commission.setSalestaff(withdrawLabelInfo.getSubordinateSystemName());//体系 commission.setSaleSystem(withdrawLabelInfo.getSubordinateSystemName());//体系
commission.setYearPREMIUM(withdrawLabelInfo.getOrderPrice().intValue());//保费 commission.setYearPREMIUM(withdrawLabelInfo.getOrderPrice().intValue());//保费
commission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式 commission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式
commission.setSalestaff(withdrawLabelInfo.getPractitionerName());//经纪人名称
commission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
//C02:续年度直接销售佣金;C03:续年度销售加码奖金;C04:月度销售加码奖金; 没有orderid //C02:续年度直接销售佣金;C03:续年度销售加码奖金;C04:月度销售加码奖金; 没有orderid
if ("C02,C03,C04,".indexOf(withdrawLabelInfo.getDropOptionCode()+",") != -1) { if ("C02".equals(withdrawLabelInfo.getDropOptionCode())) {
c020304List.add(commission); c02List.add(commission);
}
if ("C03".equals(withdrawLabelInfo.getDropOptionCode())) {
c03List.add(commission);
}
if ("C04".equals(withdrawLabelInfo.getDropOptionCode())) {
c04List.add(commission);
} }
//C01:直接销售拥金; //C01:直接销售拥金;
if ("C01".equals(withdrawLabelInfo.getDropOptionCode())) { if ("C01".equals(withdrawLabelInfo.getDropOptionCode())) {
...@@ -1179,7 +1192,20 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -1179,7 +1192,20 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
renewalYearPerformanceCommission.setFYC_RYC(String.valueOf(withdrawLabelInfo.getFycAmount())); renewalYearPerformanceCommission.setFYC_RYC(String.valueOf(withdrawLabelInfo.getFycAmount()));
renewalYearPerformanceCommission.setSaleSystem(withdrawLabelInfo.getSubordinateSystemName()); renewalYearPerformanceCommission.setSaleSystem(withdrawLabelInfo.getSubordinateSystemName());
renewalYearPerformanceCommission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式 renewalYearPerformanceCommission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式
c06070910List.add(renewalYearPerformanceCommission); renewalYearPerformanceCommission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
if ("C06".equals(withdrawLabelInfo.getDropOptionCode())) {
c06List.add(renewalYearPerformanceCommission);
}
if ("C07".equals(withdrawLabelInfo.getDropOptionCode())) {
c07List.add(renewalYearPerformanceCommission);
}
if ("C09".equals(withdrawLabelInfo.getDropOptionCode())) {
c09List.add(renewalYearPerformanceCommission);
}
if ("C10".equals(withdrawLabelInfo.getDropOptionCode())) {
c10List.add(renewalYearPerformanceCommission);
}
} }
//C99:其他,13:公司激励奖金,14:其它税前加扣款,15:加码奖金,16:季度奖金,17,银盾在线佣金 //C99:其他,13:公司激励奖金,14:其它税前加扣款,15:加码奖金,16:季度奖金,17,银盾在线佣金
...@@ -1190,15 +1216,19 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -1190,15 +1216,19 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
otherCommission.setCommissionName(withdrawLabelInfo.getCommissionType()); otherCommission.setCommissionName(withdrawLabelInfo.getCommissionType());
otherCommission.setWithdrawedId(withdrawLabelInfo.getWithdrawId()); otherCommission.setWithdrawedId(withdrawLabelInfo.getWithdrawId());
otherCommission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式 otherCommission.setCalculationFormula(withdrawLabelInfo.getCalculationFormula());//佣金计算公式
otherCommission.setSalaryCode(transformationType(withdrawLabelInfo.getDropOptionCode()));
otherCommissionLis.add(otherCommission); otherCommissionLis.add(otherCommission);
} }
} }
} }
//1,首年度销售佣金 C01 //1,首年度销售佣金 C01
responseBody.setFristYearCommissionList(c01List); responseBody.setFristYearCommissionList(c01List);
//2,续年度销售佣金 C02 //2,续年度销售佣金 C02
responseBody.setRenewalYearCommissionList(c020304List); responseBody.setRenewalYearCommissionList(c02List);//续年度直接销售佣金
responseBody.setContinuedAnnualSalesBonusList(c03List);//续年度销售加码奖金
responseBody.setMonthlySalesAddWeightList(c04List);//月度销售加码奖金
//3,首年度辅导奖金 暂时没有 //3,首年度辅导奖金 暂时没有
responseBody.setFristYearCoachCommissionList(null); responseBody.setFristYearCoachCommissionList(null);
//4,续年度辅导奖金 暂时没有 //4,续年度辅导奖金 暂时没有
...@@ -1206,7 +1236,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -1206,7 +1236,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
//5,首年度绩效奖金 暂时没有 //5,首年度绩效奖金 暂时没有
responseBody.setFirstYearPerformanceCommissionList(null); responseBody.setFirstYearPerformanceCommissionList(null);
//6,续年度绩效奖金 暂时没有 //6,续年度绩效奖金 暂时没有
responseBody.setRenewalYearPerformanceCommissionList(c06070910List); responseBody.setRenewalYearPerformanceCommissionList(null);
responseBody.setDirectCounselingList(c06List);//直接辅导岗位津贴
responseBody.setIndirectCounselingList(c07List);//间接辅导岗位津贴
responseBody.setBreedingBonusList(c09List);//育成奖金
responseBody.setTLCoachingAllowanceList(c10List);//团队长辅导津贴
//7,推介奖金 C05 个人的有orderid //7,推介奖金 C05 个人的有orderid
responseBody.setRecommendCommissionList(c05List); responseBody.setRecommendCommissionList(c05List);
//8,体系推介奖金 C05 体系的的有orderid //8,体系推介奖金 C05 体系的的有orderid
...@@ -1222,6 +1257,81 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe ...@@ -1222,6 +1257,81 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
responseBody.setOtherCommissionList(otherCommissionLis); responseBody.setOtherCommissionList(otherCommissionLis);
} }
/**
* 码值处理
*
*/
private String transformationType(String commissionType) {
//C01:直接销售拥金;
if ("C01".equals(commissionType)) {
return "A-001";
}
//C02:续年度直接销售佣金;
if ("C02".equals(commissionType)) {
return "A-002";
}
//C03:续年度销售加码奖金;
if ("C03".equals(commissionType)) {
return "A-005";
}
//C04:月度销售加码奖金; 没有orderid
if ("C04".equals(commissionType)) {
return "A-003";
}
//C05:推荐奖金; 个人的有orderid 团体的无
if ("C05".equals(commissionType)) {
return "B-004";
}
//C06:直接辅导岗位津贴;
if ("C06".equals(commissionType)) {
return "B-008";
}
//C07:间接辅导岗位津贴;
if ("C07".equals(commissionType)) {
return "B-009";
}
//C08:团队管理绩效达标奖金; 当前经纪人体系的所有保单
if ("C08".equals(commissionType)) {
return "B-006";
}
//C09:育成奖金; 被育成体系的所有保单
if ("C09".equals(commissionType)) {
return "B-010";
}
//C10:团队长辅导津贴
if ("C10".equals(commissionType)) {
return "B-011";
}
//C99:其他
if ("C99".equals(commissionType)) {
return "C-006";
}
//公司激励奖金
if ("13".equals(commissionType)) {
return "C-001";
}
//其它税前加扣款
if ("14".equals(commissionType)) {
return "C-002";
}
//加码奖金
if ("15".equals(commissionType)) {
return "C-003";
}
//季度奖金
if ("16".equals(commissionType)) {
return "C-004";
}
//银盾在线佣金
if ("17".equals(commissionType)) {
return "C-005";
}
return null;
}
private void queryYdOnlineCommission(SearchStaffSalaryDetailsRequestBody requestVO, SearchStaffSalaryDetailsResponseBody responseBody) { private void queryYdOnlineCommission(SearchStaffSalaryDetailsRequestBody requestVO, SearchStaffSalaryDetailsResponseBody responseBody) {
WithdrawQueryInfo info = new WithdrawQueryInfo(); WithdrawQueryInfo info = new WithdrawQueryInfo();
info.setPractitionerId(requestVO.getPractitionerId()); info.setPractitionerId(requestVO.getPractitionerId());
......
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/Commission.java
...@@ -35,7 +35,7 @@ public class Commission { ...@@ -35,7 +35,7 @@ public class Commission {
private String Comments; private String Comments;
private String calculationFormula; private String calculationFormula;
private String salaryCode;
public Commission() { public Commission() {
} }
...@@ -172,4 +172,12 @@ public class Commission { ...@@ -172,4 +172,12 @@ public class Commission {
public void setCalculationFormula(String calculationFormula) { public void setCalculationFormula(String calculationFormula) {
this.calculationFormula = calculationFormula; this.calculationFormula = calculationFormula;
} }
public String getSalaryCode() {
return salaryCode;
}
public void setSalaryCode(String salaryCode) {
this.salaryCode = salaryCode;
}
} }
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/OtherCommission.java
...@@ -10,7 +10,10 @@ public class OtherCommission { ...@@ -10,7 +10,10 @@ public class OtherCommission {
private String Comments;//备注 private String Comments;//备注
private Long withdrawedId; private Long withdrawedId;
private String calculationFormula;//佣金计算公式 private String calculationFormula;//佣金计算公式
/**
*薪资类型code
*/
private String salaryCode;
public OtherCommission() { public OtherCommission() {
} }
...@@ -61,4 +64,12 @@ public class OtherCommission { ...@@ -61,4 +64,12 @@ public class OtherCommission {
public void setCalculationFormula(String calculationFormula) { public void setCalculationFormula(String calculationFormula) {
this.calculationFormula = calculationFormula; this.calculationFormula = calculationFormula;
} }
public String getSalaryCode() {
return salaryCode;
}
public void setSalaryCode(String salaryCode) {
this.salaryCode = salaryCode;
}
} }
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RenewalYearPerformanceCommission.java
...@@ -9,7 +9,10 @@ public class RenewalYearPerformanceCommission { ...@@ -9,7 +9,10 @@ public class RenewalYearPerformanceCommission {
private String Commission; private String Commission;
private String Comments; private String Comments;
private String calculationFormula;//佣金计算公式 private String calculationFormula;//佣金计算公式
/**
*薪资类型code
*/
private String salaryCode;
public RenewalYearPerformanceCommission() { public RenewalYearPerformanceCommission() {
} }
...@@ -61,4 +64,12 @@ public class RenewalYearPerformanceCommission { ...@@ -61,4 +64,12 @@ public class RenewalYearPerformanceCommission {
public void setCalculationFormula(String calculationFormula) { public void setCalculationFormula(String calculationFormula) {
this.calculationFormula = calculationFormula; this.calculationFormula = calculationFormula;
} }
public String getSalaryCode() {
return salaryCode;
}
public void setSalaryCode(String salaryCode) {
this.salaryCode = salaryCode;
}
} }
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseBody.java
...@@ -36,10 +36,21 @@ public class SearchStaffSalaryDetailsResponseBody { ...@@ -36,10 +36,21 @@ public class SearchStaffSalaryDetailsResponseBody {
private List<FirstYearPerformanceCommission> FirstYearPerformanceCommissionList; private List<FirstYearPerformanceCommission> FirstYearPerformanceCommissionList;
private List<RenewalYearPerformanceCommission> RenewalYearPerformanceCommissionList; private List<RenewalYearPerformanceCommission> RenewalYearPerformanceCommissionList;//续年度绩效奖金
private List<OtherCommission> OtherCommissionList; private List<OtherCommission> OtherCommissionList;
private List<Commission> monthlySalesAddWeightList;//月度销售加码奖金
private List<Commission> continuedAnnualSalesBonusList;//续年度销售加码奖金
private List<RenewalYearPerformanceCommission> directCounselingList;//直接辅导岗位津贴
private List<RenewalYearPerformanceCommission> indirectCounselingList;//隔代辅导岗位津贴
private List<RenewalYearPerformanceCommission> TLCoachingAllowanceList;//团队长辅导津贴
private List<RenewalYearPerformanceCommission> breedingBonusList;//育成奖金
public SearchStaffSalaryDetailsResponseBody() { public SearchStaffSalaryDetailsResponseBody() {
} }
...@@ -163,4 +174,52 @@ public class SearchStaffSalaryDetailsResponseBody { ...@@ -163,4 +174,52 @@ public class SearchStaffSalaryDetailsResponseBody {
public void setOtherCommissionList(List<OtherCommission> otherCommissionList) { public void setOtherCommissionList(List<OtherCommission> otherCommissionList) {
OtherCommissionList = otherCommissionList; OtherCommissionList = otherCommissionList;
} }
public List<Commission> getMonthlySalesAddWeightList() {
return monthlySalesAddWeightList;
}
public void setMonthlySalesAddWeightList(List<Commission> monthlySalesAddWeightList) {
this.monthlySalesAddWeightList = monthlySalesAddWeightList;
}
public List<Commission> getContinuedAnnualSalesBonusList() {
return continuedAnnualSalesBonusList;
}
public void setContinuedAnnualSalesBonusList(List<Commission> continuedAnnualSalesBonusList) {
this.continuedAnnualSalesBonusList = continuedAnnualSalesBonusList;
}
public List<RenewalYearPerformanceCommission> getDirectCounselingList() {
return directCounselingList;
}
public void setDirectCounselingList(List<RenewalYearPerformanceCommission> directCounselingList) {
this.directCounselingList = directCounselingList;
}
public List<RenewalYearPerformanceCommission> getIndirectCounselingList() {
return indirectCounselingList;
}
public void setIndirectCounselingList(List<RenewalYearPerformanceCommission> indirectCounselingList) {
this.indirectCounselingList = indirectCounselingList;
}
public List<RenewalYearPerformanceCommission> getTLCoachingAllowanceList() {
return TLCoachingAllowanceList;
}
public void setTLCoachingAllowanceList(List<RenewalYearPerformanceCommission> TLCoachingAllowanceList) {
this.TLCoachingAllowanceList = TLCoachingAllowanceList;
}
public List<RenewalYearPerformanceCommission> getBreedingBonusList() {
return breedingBonusList;
}
public void setBreedingBonusList(List<RenewalYearPerformanceCommission> breedingBonusList) {
this.breedingBonusList = breedingBonusList;
}
} }
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