Skip to content

Y
yd-csf
Commit 46da6cbd by jianan
Options

出账检核-增加币种24

parent a278c112
Showing with 55 additions and 9 deletions
yd-csf-service/src/main/java/com/yd/csf/service/service/PolicyBrokerService.java
...@@ -4,8 +4,10 @@ import com.yd.csf.service.dto.QueryPolicyBrokerDto; ...@@ -4,8 +4,10 @@ import com.yd.csf.service.dto.QueryPolicyBrokerDto;
import com.yd.csf.service.model.PolicyBroker; import com.yd.csf.service.model.PolicyBroker;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* @author Zhang Jianan * @author Zhang Jianan
...@@ -22,6 +24,7 @@ public interface PolicyBrokerService extends IService<PolicyBroker> { ...@@ -22,6 +24,7 @@ public interface PolicyBrokerService extends IService<PolicyBroker> {
List<String> selectRelatedBrokerBizIds(String clientUserId); List<String> selectRelatedBrokerBizIds(String clientUserId);
Map<String, PolicyBroker> queryPolicyBrokerMap(Collection<String> policyNoSet);
Map<String, String> queryInternalCodeMap(List<String> brokerBizIdList); Map<String, String> queryInternalCodeMap(List<String> brokerBizIdList);
} }
yd-csf-service/src/main/java/com/yd/csf/service/service/PolicyPolicyholderService.java
...@@ -4,6 +4,9 @@ import com.yd.csf.service.dto.PolicyPolicyholderUpdateRequest; ...@@ -4,6 +4,9 @@ import com.yd.csf.service.dto.PolicyPolicyholderUpdateRequest;
import com.yd.csf.service.model.PolicyPolicyholder; import com.yd.csf.service.model.PolicyPolicyholder;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
import java.util.Map;
import java.util.List; import java.util.List;
/** /**
...@@ -22,6 +25,8 @@ public interface PolicyPolicyholderService extends IService<PolicyPolicyholder> ...@@ -22,6 +25,8 @@ public interface PolicyPolicyholderService extends IService<PolicyPolicyholder>
PolicyPolicyholder queryOne(String policyBizId); PolicyPolicyholder queryOne(String policyBizId);
Map<String, PolicyPolicyholder> queryPolicyholderMap(Collection<?> policyNoList);
List<PolicyPolicyholder> queryList(String policyHolder); List<PolicyPolicyholder> queryList(String policyHolder);
boolean updateName(String policyBizId,String name); boolean updateName(String policyBizId,String name);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
...@@ -84,6 +84,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -84,6 +84,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
private ApiExchangeRateFeignClient apiExchangeRateFeignClient; private ApiExchangeRateFeignClient apiExchangeRateFeignClient;
@Resource @Resource
private ApiInsuranceReconciliationCompanyFeignClient apiInsuranceReconciliationCompanyFeignClient; private ApiInsuranceReconciliationCompanyFeignClient apiInsuranceReconciliationCompanyFeignClient;
@Resource
private PolicyPolicyholderService policyPolicyholderService;
@Override @Override
...@@ -155,6 +157,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -155,6 +157,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
.list(); .list();
Map<String, CommissionExpected> commissionExpectedMap = commissionExpectedList.stream().collect(Collectors.toMap(CommissionExpected::getCommissionExpectedBizId, a -> a, (oldValue, newValue) -> newValue)); Map<String, CommissionExpected> commissionExpectedMap = commissionExpectedList.stream().collect(Collectors.toMap(CommissionExpected::getCommissionExpectedBizId, a -> a, (oldValue, newValue) -> newValue));
// 3.关联查询投保人名称
Map<String, PolicyPolicyholder> policyholderMap = policyPolicyholderService.queryPolicyholderMap(policyNoSet);
// 4.关联查询转介人
Map<String, PolicyBroker> policyBrokerMap = policyBrokerService.queryPolicyBrokerMap(policyNoSet);
// 填充信息 // 填充信息
List<CommissionVO> commissionVOList = commissionList.stream().map(commission -> { List<CommissionVO> commissionVOList = commissionList.stream().map(commission -> {
CommissionVO commissionVO = CommissionVO.objToVo(commission); CommissionVO commissionVO = CommissionVO.objToVo(commission);
...@@ -168,12 +176,24 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -168,12 +176,24 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
} }
CommissionExpected commissionExpected = commissionExpectedMap.get(commission.getCommissionExpectedBizId()); CommissionExpected commissionExpected = commissionExpectedMap.get(commission.getCommissionExpectedBizId());
if (commissionExpected != null) { if (commissionExpected != null) {
// 填充应收账款编号、预计入账状态 // 填充应收账款编号、预计入账状态、保单本期来佣率
commissionVO.setReceivableNo(commissionExpected.getReceivableNo()); commissionVO.setReceivableNo(commissionExpected.getReceivableNo());
commissionVO.setPaidRatio(commissionExpected.getPaidRatio()); commissionVO.setPaidRatio(commissionExpected.getPaidRatio());
commissionVO.setPendingRatio(commissionExpected.getPendingRatio()); commissionVO.setPendingRatio(commissionExpected.getPendingRatio());
commissionVO.setStatusDesc(commissionExpected.getStatusDesc()); commissionVO.setStatusDesc(commissionExpected.getStatusDesc());
commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus()); commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus());
commissionVO.setCommissionRatio(commissionExpected.getCommissionRatio());
}
PolicyPolicyholder policyholder = policyholderMap.get(commission.getPolicyNo());
if (policyholder != null) {
// 填充投保人名称
commissionVO.setPolicyHolder(policyholder.getName());
commissionVO.setPolicyHolderEn(policyholder.getNameEn());
}
PolicyBroker policyBroker = policyBrokerMap.get(commission.getPolicyNo());
if (policyBroker != null) {
// 填充转介人名称
commissionVO.setBroker(policyBroker.getBrokerName());
} }
return commissionVO; return commissionVO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyBrokerServiceImpl.java
...@@ -11,9 +11,8 @@ import org.apache.commons.lang3.StringUtils; ...@@ -11,9 +11,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.Collections; import java.util.*;
import java.util.List; import java.util.function.Function;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -61,6 +60,15 @@ public class PolicyBrokerServiceImpl extends ServiceImpl<PolicyBrokerMapper, Pol ...@@ -61,6 +60,15 @@ public class PolicyBrokerServiceImpl extends ServiceImpl<PolicyBrokerMapper, Pol
} }
@Override @Override
public Map<String, PolicyBroker> queryPolicyBrokerMap(Collection<String> policyNoSet) {
if (CollectionUtils.isEmpty(policyNoSet)) {
return Collections.emptyMap();
}
List<PolicyBroker> list = this.lambdaQuery().in(PolicyBroker::getPolicyNo, policyNoSet).list();
return list.stream().collect(Collectors.toMap(PolicyBroker::getPolicyNo, Function.identity()));
}
@Override
public Map<String, String> queryInternalCodeMap(List<String> brokerBizIdList) { public Map<String, String> queryInternalCodeMap(List<String> brokerBizIdList) {
if (CollectionUtils.isEmpty(brokerBizIdList)) { if (CollectionUtils.isEmpty(brokerBizIdList)) {
return Collections.emptyMap(); return Collections.emptyMap();
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyPolicyholderServiceImpl.java
...@@ -9,8 +9,6 @@ import com.yd.common.exception.BusinessException; ...@@ -9,8 +9,6 @@ import com.yd.common.exception.BusinessException;
import com.yd.common.utils.ChineseTextConverter; import com.yd.common.utils.ChineseTextConverter;
import com.yd.common.utils.EnglishTextUtil; import com.yd.common.utils.EnglishTextUtil;
import com.yd.csf.service.dto.PolicyPolicyholderUpdateRequest; import com.yd.csf.service.dto.PolicyPolicyholderUpdateRequest;
import com.yd.csf.service.enums.FnaStatusEnum;
import com.yd.csf.service.model.Fna;
import com.yd.csf.service.model.PolicyPolicyholder; import com.yd.csf.service.model.PolicyPolicyholder;
import com.yd.csf.service.service.PolicyPolicyholderService; import com.yd.csf.service.service.PolicyPolicyholderService;
import com.yd.csf.service.dao.PolicyPolicyholderMapper; import com.yd.csf.service.dao.PolicyPolicyholderMapper;
...@@ -20,9 +18,8 @@ import org.apache.commons.lang3.StringUtils; ...@@ -20,9 +18,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collections; import java.util.*;
import java.util.Date; import java.util.stream.Collectors;
import java.util.List;
/** /**
* @author Zhang Jianan * @author Zhang Jianan
...@@ -58,6 +55,19 @@ public class PolicyPolicyholderServiceImpl extends ServiceImpl<PolicyPolicyholde ...@@ -58,6 +55,19 @@ public class PolicyPolicyholderServiceImpl extends ServiceImpl<PolicyPolicyholde
} }
@Override @Override
public Map<String, PolicyPolicyholder> queryPolicyholderMap(Collection<?> policyNoList) {
if (CollectionUtils.isEmpty(policyNoList)) {
return Collections.emptyMap();
}
List<PolicyPolicyholder> policyholderList = this.lambdaQuery()
.in(PolicyPolicyholder::getPolicyNo, policyNoList)
.list();
return policyholderList.stream().collect(Collectors.toMap(PolicyPolicyholder::getPolicyNo, a -> a, (oldValue, newValue) -> newValue));
}
@Override
public List<PolicyPolicyholder> queryList(String policyHolder) { public List<PolicyPolicyholder> queryList(String policyHolder) {
// 输入为空时直接返回空列表，避免无意义的全表查询 // 输入为空时直接返回空列表，避免无意义的全表查询
if (StringUtils.isBlank(policyHolder)) { if (StringUtils.isBlank(policyHolder)) {
......
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