Commit 17710612 by zhangxingmin

push

parent 48068e69
...@@ -756,9 +756,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -756,9 +756,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
commissionExpected.setProductLaunchBizId(policy.getProductLaunchBizId()); commissionExpected.setProductLaunchBizId(policy.getProductLaunchBizId());
commissionExpected.setPremium(policy.getPaymentPremium()); commissionExpected.setPremium(policy.getPaymentPremium());
} else { } else {
BigDecimal expectedAmount = addDto.getAmount() // BigDecimal expectedAmount = addDto.getAmount()
.multiply(addDto.getExchangeRate()); // .multiply(addDto.getExchangeRate());
commissionExpected.setExpectedAmount(expectedAmount); commissionExpected.setExpectedAmount(addDto.getAmount());
} }
if (StringUtils.isBlank(addDto.getCommissionExpectedBizId())) { if (StringUtils.isBlank(addDto.getCommissionExpectedBizId())) {
...@@ -808,9 +808,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -808,9 +808,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
if (StringUtils.isBlank(request.getCurrency())) { if (StringUtils.isBlank(request.getCurrency())) {
throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账币种不能为空"); throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账币种不能为空");
} }
if (request.getExchangeRate() == null) { // if (request.getExchangeRate() == null) {
throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "结算汇率不能为空"); // throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "结算汇率不能为空");
} // }
if ("R".equals(request.getCommissionBizType())) { if ("R".equals(request.getCommissionBizType())) {
if (request.getCommissionRatio() == null) { if (request.getCommissionRatio() == null) {
throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "关联保单应收单,佣金比例不能为空"); throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "关联保单应收单,佣金比例不能为空");
......
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