push

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java

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