push

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

@@ -255,6 +255,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         vo.setCommissionDate(null);
         vo.setCommissionDate(null);
         //本次入账比例
         //本次入账比例
         vo.setRevenueRatio(null);
         vo.setRevenueRatio(null);
+        vo.setRealRemark(expected.getRemark());
+        vo.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
 
 
         // 填充保单信息
         // 填充保单信息
         Policy policy = policyMap.get(expected.getPolicyNo());
         Policy policy = policyMap.get(expected.getPolicyNo());
@@ -358,6 +360,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         vo.setRealUpdaterName(commission.getUpdaterName());
         vo.setRealUpdaterName(commission.getUpdaterName());
         vo.setRealRemark(commission.getRemark());
         vo.setRealRemark(commission.getRemark());
         vo.setCommissionDate(commission.getCommissionDate());
         vo.setCommissionDate(commission.getCommissionDate());
+        vo.setRealRemark(commission.getRemark());
+        vo.setCommissionBizId(commission.getCommissionBizId());
 
 
         // 覆盖公共业务字段
         // 覆盖公共业务字段
 //        vo.setAmount(commission.getAmount());
 //        vo.setAmount(commission.getAmount());

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

@@ -984,9 +984,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             if (ObjectUtils.isEmpty(request.getAmount())) {
             if (ObjectUtils.isEmpty(request.getAmount())) {
                 throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账金额不能为空");
                 throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "入账金额不能为空");
             }
             }
-            if (ObjectUtils.isEmpty(request.getExchangeRate())) {
-                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "结算汇率不能为空");
-            }
+//            if (ObjectUtils.isEmpty(request.getExchangeRate())) {
+//                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "结算汇率不能为空");
+//            }
             if ("R".equals(request.getCommissionBizType())) {
             if ("R".equals(request.getCommissionBizType())) {
                 // 校验保单号是否存在
                 // 校验保单号是否存在
                 if (ObjectUtils.isEmpty(request.getExchangeRate())) {
                 if (ObjectUtils.isEmpty(request.getExchangeRate())) {

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedNewVO.java

@@ -16,6 +16,18 @@ import java.util.List;
 @Data
 @Data
 @Schema(description = "预计来佣响应")
 @Schema(description = "预计来佣响应")
 public class CommissionExpectedNewVO implements Serializable {
 public class CommissionExpectedNewVO implements Serializable {
+
+    /**
+     * 预计来佣业务id
+     */
+    private String commissionExpectedBizId;
+
+    /**
+     * 保单来佣业务id
+     */
+    private String commissionBizId;
+
+
     //===========公共字段=============
     //===========公共字段=============
     /**
     /**
      * 是否实收：1-预计（预计来佣记录） 2-实收（保单来佣表记录）*
      * 是否实收：1-预计（预计来佣记录） 2-实收（保单来佣表记录）*