新单跟进98

yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedAddDto.java

@@ -69,6 +69,11 @@ public class CommissionExpectedAddDto {
     private BigDecimal commissionRatio;
 
     /**
+     * 来佣比例
+     */
+    private BigDecimal ratio;
+
+    /**
      * 来佣币种
      */
     @Schema(description = "来佣币种")

yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedUpdateRequest.java

@@ -67,6 +67,17 @@ public class CommissionExpectedUpdateRequest implements Serializable {
     @Schema(description = "来佣类型(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)")
     private String commissionType;
 
+     /**
+     * 来佣比例
+     */
+    @Schema(description = "来佣比例")
+    private BigDecimal commissionRatio;
+
+    /**
+     * 来佣比例
+     */
+    private BigDecimal ratio;
+
     /**
      * 来佣金额
      */

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

@@ -150,6 +150,9 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         for (CommissionExpectedAddDto addDto : addDtoList) {
             CommissionExpected commissionExpected = new CommissionExpected();
             BeanUtils.copyProperties(addDto, commissionExpected);
+            if (commissionExpected.getCommissionRatio() == null) {
+                commissionExpected.setCommissionRatio(addDto.getRatio());
+            }
 
             // 校验参数
             validCommissionExpected(commissionExpected, true);
@@ -198,10 +201,24 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         if (commissionExpected == null) {
             throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计来佣不存在");
         }
+        if (commissionExpected.getCommissionRatio() == null) {
+            if (commissionExpectedUpdateRequest.getRatio() != null) {
+                commissionExpected.setCommissionRatio(commissionExpectedUpdateRequest.getRatio());
+            } else {
+                commissionExpected.setCommissionRatio(commissionExpectedUpdateRequest.getCommissionRatio());
+            }
+        }
         // 校验数据
         validCommissionExpected(commissionExpected, false);
         // 转换为实体类
         BeanUtils.copyProperties(commissionExpectedUpdateRequest, commissionExpected);
+        if (commissionExpected.getCommissionRatio() == null) {
+            if (commissionExpectedUpdateRequest.getRatio() != null) {
+                commissionExpected.setCommissionRatio(commissionExpectedUpdateRequest.getRatio());
+            } else {
+                commissionExpected.setCommissionRatio(commissionExpectedUpdateRequest.getCommissionRatio());
+            }
+        }
         commissionExpected.setUpdateTime(new Date());
         // 更新预计来佣
         return this.updateById(commissionExpected);