Skip to content

Y
yd-csf
Commit 5532b1aa by jianan
Options

新单跟进126

parent 73812bdb
Showing with 22 additions and 3 deletions
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
...@@ -14,8 +14,10 @@ import com.yd.csf.service.dto.CommissionExpectedQueryRequest; ...@@ -14,8 +14,10 @@ import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
import com.yd.csf.service.dto.CommissionExpectedUpdateRequest; import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
import com.yd.csf.service.enums.CommissionExpectedStatusEnum; import com.yd.csf.service.enums.CommissionExpectedStatusEnum;
import com.yd.csf.service.model.CommissionExpected; import com.yd.csf.service.model.CommissionExpected;
import com.yd.csf.service.model.Policy;
import com.yd.csf.service.service.CommissionExpectedService; import com.yd.csf.service.service.CommissionExpectedService;
import com.yd.csf.service.dao.CommissionExpectedMapper; import com.yd.csf.service.dao.CommissionExpectedMapper;
import com.yd.csf.service.service.PolicyService;
import com.yd.csf.service.vo.CommissionExpectedVO; import com.yd.csf.service.vo.CommissionExpectedVO;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
...@@ -24,6 +26,7 @@ import org.springframework.beans.BeanUtils; ...@@ -24,6 +26,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -37,6 +40,9 @@ import java.util.stream.Collectors; ...@@ -37,6 +40,9 @@ import java.util.stream.Collectors;
public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpectedMapper, CommissionExpected> public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpectedMapper, CommissionExpected>
implements CommissionExpectedService{ implements CommissionExpectedService{
@Resource
private PolicyService policyService;
@Override @Override
public Page<CommissionExpectedVO> getCommissionExpectedVOPage(Page<CommissionExpected> commissionExpectedPage) { public Page<CommissionExpectedVO> getCommissionExpectedVOPage(Page<CommissionExpected> commissionExpectedPage) {
List<CommissionExpected> CommissionExpectedList = commissionExpectedPage.getRecords(); List<CommissionExpected> CommissionExpectedList = commissionExpectedPage.getRecords();
...@@ -144,6 +150,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -144,6 +150,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
if (CollUtil.isEmpty(addDtoList)) { if (CollUtil.isEmpty(addDtoList)) {
throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计来佣列表不能为空"); throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计来佣列表不能为空");
} }
// 查询保单信息
String policyNo = addDtoList.get(0).getPolicyNo();
Policy policy = policyService.getOne(new QueryWrapper<Policy>().eq("policy_no", policyNo));
List<CommissionExpected> addList = new ArrayList<>(); List<CommissionExpected> addList = new ArrayList<>();
List<CommissionExpected> updateList = new ArrayList<>(); List<CommissionExpected> updateList = new ArrayList<>();
...@@ -152,6 +161,13 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -152,6 +161,13 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
BeanUtils.copyProperties(addDto, commissionExpected); BeanUtils.copyProperties(addDto, commissionExpected);
// 默认结算汇率 7.8 美元对港币 // 默认结算汇率 7.8 美元对港币
commissionExpected.setDefaultExchangeRate(BigDecimal.valueOf(7.8)); commissionExpected.setDefaultExchangeRate(BigDecimal.valueOf(7.8));
// 预计总金额
if (policy != null) {
BigDecimal expectedAmount = policy.getPaymentPremium()
.multiply(commissionExpected.getCommissionRatio())
.multiply(commissionExpected.getDefaultExchangeRate());
commissionExpected.setExpectedAmount(expectedAmount);
}
// 校验参数 // 校验参数
validCommissionExpected(commissionExpected, true); validCommissionExpected(commissionExpected, true);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
...@@ -503,9 +503,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -503,9 +503,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
// 预计来佣比例 // 预计来佣比例
BigDecimal expectedCommissionRatio = expected.getCommissionRatio(); BigDecimal expectedCommissionRatio = expected.getCommissionRatio();
// 预计总金额 // 预计总金额
BigDecimal expectedAmount = new BigDecimal(premium) BigDecimal expectedAmount = expected.getExpectedAmount();
.multiply(expected.getCommissionRatio()) if (expectedAmount == null || BigDecimal.ZERO.compareTo(currentCommissionRatio) == 0) {
.multiply(expected.getDefaultExchangeRate()); expectedAmount = new BigDecimal(premium)
.multiply(expected.getCommissionRatio())
.multiply(expected.getDefaultExchangeRate());
}
// 已入账金额 // 已入账金额
BigDecimal paidAmount = commission.getAmount().add(ObjectUtils.defaultIfNull(expected.getPaidAmount(), BigDecimal.ZERO)); BigDecimal paidAmount = commission.getAmount().add(ObjectUtils.defaultIfNull(expected.getPaidAmount(), BigDecimal.ZERO));
......
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