前端对接问题修复96

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

@@ -45,6 +45,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
 import java.util.*;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -165,8 +166,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 // 填充应收账款编号、已入账比例、待入账比例
                 // 填充应收账款编号、已入账比例、待入账比例
                 commissionVO.setReceivableNo(commissionExpected.getReceivableNo());
                 commissionVO.setReceivableNo(commissionExpected.getReceivableNo());
                 if (commissionExpected.getCommissionRatio() != null) {
                 if (commissionExpected.getCommissionRatio() != null) {
-                    commissionVO.setPaidRatio(commissionExpected.getPaidRatio());
-                    commissionVO.setPendingRatio(commissionExpected.getCommissionRatio().subtract(commissionExpected.getPaidRatio()));
+                    BigDecimal paidRatio = commissionExpected.getPaidRatio() != null ? commissionExpected.getPaidRatio() : BigDecimal.ZERO;
+                    commissionVO.setPaidRatio(paidRatio);
+                    commissionVO.setPendingRatio(commissionExpected.getCommissionRatio().subtract(paidRatio));
                 }
                 }
                 commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus());
                 commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus());
             }
             }