Skip to content

Y
yd-backend
Commit 260e21b8 by jianan
Options

薪资单逻辑调整，N22接口地址数据库配置

parent f621a3f9
Showing with 42 additions and 32 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
......@@ -61,6 +61,7 @@ import com.yd.rmi.n22.staff.pojo.Staff;
import com.yd.rmi.n22.staff.service.N22StaffService;
import com.yd.util.CommonUtil;
import com.yd.util.config.ZHBErrorConfig;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -340,17 +341,24 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
// 组装返回参数
List<PayScaleInfo> resultList = new ArrayList<>();
// 应发佣金
Double monDtlAmount = 0D;
// 应发佣金
Double monDtlRAmount = 0D;
for (String key : group.keySet()) {
System.out.println("Key = " + key);
List<SalaryDetails> list = group.get(key);
// 计算每组应发佣金总和
Double monDtlAmount = this.getSummary(list);
if (CollectionUtils.isNotEmpty(list)) {
monDtlAmount = list.get(0).getSumcommission();
monDtlRAmount = list.get(0).getTax_free_comis();
}
PayScaleInfo payScaleInfo = new PayScaleInfo();
payScaleInfo.setMonDtlAmount(monDtlAmount);
payScaleInfo.setMonDtlItem("实发薪水");
payScaleInfo.setMonDtlRAmount(monDtlRAmount);
payScaleInfo.setDrpTitleCode(list.get(0).getGrade());
payScaleInfo.setMonDtlPeriod(Long.valueOf(key));
......@@ -410,16 +418,6 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
// return responseVO;
}
private Double getSummary(List<SalaryDetails> list) {
Double sum = 0D;
for (SalaryDetails item : list) {
sum = BigDecimal.valueOf(item.getCommission())
.add(BigDecimal.valueOf(sum))
.doubleValue();
}
return sum;
}
/**
* 通过for循环逻辑，编程上会麻烦点，但是效率上高很多
*/
......@@ -441,12 +439,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
childList.add(SalaryDetails);
}
result.forEach((cc, list) -> {
System.out.println("CheckDate is:" + cc);
list.forEach((SalaryDetails) -> {
System.out.println("SalaryDetails is:" + SalaryDetails);
});
});
return result;
}
......
yd-api/src/main/java/com/yd/rmi/n22/policy/service/impl/N22PolicyServiceImpl.java
package com.yd.rmi.n22.policy.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.yd.rmi.cache.SystemConfigService;
import com.yd.rmi.n22.common.utils.N22Utils;
import com.yd.rmi.n22.policy.pojo.policydetail.PolicyDetailQueryRequestBody;
import com.yd.rmi.n22.policy.pojo.policydetail.PolicyDetailQueryResponseVO;
......@@ -9,6 +10,7 @@ import com.yd.rmi.n22.policy.pojo.policylist.PolicyListQueryResponseVO;
import com.yd.rmi.n22.policy.service.N22PolicyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.UUID;
......@@ -17,6 +19,9 @@ import java.util.UUID;
public class N22PolicyServiceImpl implements N22PolicyService {
private final static Logger logger = LoggerFactory.getLogger(N22PolicyServiceImpl.class);
@Autowired
private SystemConfigService systemConfigService;
@Override
public PolicyListQueryResponseVO policyList(PolicyListQueryRequestBody requestBody) {
JSONObject obj = new JSONObject(); //传参
......@@ -29,9 +34,8 @@ public class N22PolicyServiceImpl implements N22PolicyService {
obj.put("requestBody", requestBody);
logger.info("N22查询保单列表请求报文："+obj.toString());
// String url = "https://life.ydinsurance.cn/EliteGeneralHttpTask/GeneralService/PolicyList";
String url = "http://101.132.32.185:8082/EliteGeneralHttpTask/GeneralService/PolicyList";
String url = systemConfigService.getSingleConfigValue("N22_URL_Policy_List ");
String result = N22Utils.postTransaction(url, obj.toString());
// logger.info("N22查询保单列表响应报文："+result);
......@@ -52,8 +56,7 @@ public class N22PolicyServiceImpl implements N22PolicyService {
obj.put("requestBody", requestBody);
logger.info("N22查询保单详情请求报文："+obj.toString());
// String url = "https://life.ydinsurance.cn/EliteGeneralHttpTask/GeneralService/PolicyInfo";
String url = "http://101.132.32.185:8082/EliteGeneralHttpTask/GeneralService/PolicyInfo";
String url = systemConfigService.getSingleConfigValue("N22_URL_Policy_Info ");
String result = N22Utils.postTransaction(url, obj.toString());
logger.info("N22查询保单详情响应报文："+result);
......
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/SalaryDetails.java
......@@ -18,13 +18,13 @@ public class SalaryDetails {
private String Pol_Name_Chn;
private double commission;
private Double commission;
private double tax_commission;
private Double tax_commission;
private int Tax;
private double AfterTaxCommissionTax;
private Double AfterTaxCommissionTax;
private String GrantDate;
......@@ -49,4 +49,10 @@ public class SalaryDetails {
private String CheckDate;
private Double sumcommission;
private Double tax_free_comis;
private Double value_add_tax;
}
yd-api/src/main/java/com/yd/rmi/n22/salary/service/impl/N22SalaryServiceImpl.java
package com.yd.rmi.n22.salary.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.yd.rmi.cache.SystemConfigService;
import com.yd.rmi.n22.common.utils.N22Utils;
import com.yd.rmi.n22.salary.pojo.SalaryDetails;
import com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchRequestBody;
......@@ -8,6 +9,7 @@ import com.yd.rmi.n22.salary.pojo.SalaryDetailsSearchResponseVO;
import com.yd.rmi.n22.salary.service.N22SalaryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
......@@ -17,10 +19,12 @@ public class N22SalaryServiceImpl implements N22SalaryService {
private final static Logger logger = LoggerFactory.getLogger(N22SalaryServiceImpl.class);
@Autowired
private SystemConfigService systemConfigService;
@Override
public SalaryDetailsSearchResponseVO salaryDetailsSearch(SalaryDetailsSearchRequestBody salaryDetailsSearchRequestBody) {
JSONObject obj = new JSONObject(); //传参
JSONObject rObj; //返回结果
JSONObject obj = new JSONObject(); //接口传参
JSONObject requestHead = new JSONObject();
requestHead.put("seqNo", UUID.randomUUID().toString());
......@@ -29,8 +33,8 @@ public class N22SalaryServiceImpl implements N22SalaryService {
obj.put("requestBody", salaryDetailsSearchRequestBody);
logger.info("N22佣金明细查询请求报文："+obj.toString());
// String url = "https://life.ydinsurance.cn/EliteGeneralHttpTask/GeneralService/SalaryDetailsSearch";
String url = "http://101.132.32.185:8082/EliteGeneralHttpTask/GeneralService/SalaryDetailsSearch";
String url = systemConfigService.getSingleConfigValue("N22_URL_Salary_Details_Search");
String result = N22Utils.postTransaction(url, obj.toString());
logger.info("N22佣金明细查询响应报文："+result);
......
yd-api/src/main/java/com/yd/rmi/n22/staff/service/impl/N22StaffServiceImpl.java
package com.yd.rmi.n22.staff.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.yd.rmi.cache.SystemConfigService;
import com.yd.rmi.n22.common.utils.N22Utils;
import com.yd.rmi.n22.policy.service.impl.N22PolicyServiceImpl;
import com.yd.rmi.n22.staff.pojo.GetStaffNewRequestBody;
......@@ -9,6 +10,7 @@ import com.yd.rmi.n22.staff.pojo.Staff;
import com.yd.rmi.n22.staff.service.N22StaffService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
......@@ -18,11 +20,13 @@ import java.util.UUID;
public class N22StaffServiceImpl implements N22StaffService {
private final static Logger logger = LoggerFactory.getLogger(N22PolicyServiceImpl.class);
@Autowired
private SystemConfigService systemConfigService;
@Override
public GetStaffNewResponseVO getStaffNew(GetStaffNewRequestBody getStaffNewRequestBody) {
JSONObject obj = new JSONObject(); //传参
JSONObject rObj; //返回结果
JSONObject requestHead = new JSONObject();
requestHead.put("seqNo", UUID.randomUUID().toString());
......@@ -31,8 +35,8 @@ public class N22StaffServiceImpl implements N22StaffService {
obj.put("requestBody", getStaffNewRequestBody);
logger.info("N22员工查询请求报文："+obj.toString());
// String url = "https://life.ydinsurance.cn/EliteGeneralHttpTask/GeneralService/getStaffNew";
String url = "http://101.132.32.185:8082/EliteGeneralHttpTask/GeneralService/getStaffNew";
String url = systemConfigService.getSingleConfigValue("N22_URL_Get_Staff_New");
String result = N22Utils.postTransaction(url, obj.toString());
logger.info("N22员工查询响应报文："+result);
......
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