新单跟进100

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

@@ -150,8 +150,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         for (CommissionExpectedAddDto addDto : addDtoList) {
         for (CommissionExpectedAddDto addDto : addDtoList) {
             CommissionExpected commissionExpected = new CommissionExpected();
             CommissionExpected commissionExpected = new CommissionExpected();
             BeanUtils.copyProperties(addDto, commissionExpected);
             BeanUtils.copyProperties(addDto, commissionExpected);
-            if (commissionExpected.getCommissionRatio() == null) {
+            if (addDto.getRatio() != null) {
                 commissionExpected.setCommissionRatio(addDto.getRatio());
                 commissionExpected.setCommissionRatio(addDto.getRatio());
+            } else {
+                commissionExpected.setCommissionRatio(addDto.getCommissionRatio());
             }
             }
 
 
             // 校验参数
             // 校验参数
@@ -212,12 +214,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         validCommissionExpected(commissionExpected, false);
         validCommissionExpected(commissionExpected, false);
         // 转换为实体类
         // 转换为实体类
         BeanUtils.copyProperties(commissionExpectedUpdateRequest, commissionExpected);
         BeanUtils.copyProperties(commissionExpectedUpdateRequest, commissionExpected);
-        if (commissionExpected.getCommissionRatio() == null) {
-            if (commissionExpectedUpdateRequest.getRatio() != null) {
-                commissionExpected.setCommissionRatio(commissionExpectedUpdateRequest.getRatio());
-            } else {
-                commissionExpected.setCommissionRatio(commissionExpectedUpdateRequest.getCommissionRatio());
-            }
+        if (commissionExpectedUpdateRequest.getRatio() != null) {
+            commissionExpected.setCommissionRatio(commissionExpectedUpdateRequest.getRatio());
+        } else {
+            commissionExpected.setCommissionRatio(commissionExpectedUpdateRequest.getCommissionRatio());
         }
         }
         commissionExpected.setUpdateTime(new Date());
         commissionExpected.setUpdateTime(new Date());
         // 更新预计来佣
         // 更新预计来佣