修改费用因子bug

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -99,12 +99,20 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 //        if(agreementProductCosts == null || agreementProductCosts.size() == 0){
 //            throw new SystemException("协议费用因子为空");
 //        }
+        for(int i=0;i<agreementProductCosts.size();i++)
+        {
+            if(agreementProductCosts.get(i).getPriorityLevel()==null){
+                agreementProductCosts.get(i).setPriorityLevel(1);
+            }
+        }
         if(agreementProductCosts.size() > 0) {
             //按优先级进行排序
             Collections.sort(agreementProductCosts, Comparator.comparingInt(AgreementProductCosts::getPriorityLevel).reversed());
             //遍历费用因子
             String costsId = verificationCosts(agreementProductCosts, insAreaCompany, insOrders);
-            calcCosts(costsId, insAreaCompany);
+            if(costsId != null) {
+                calcCosts(costsId, insAreaCompany);
+            }
         }
     }
 
@@ -460,7 +468,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 }
             }
         }
-        throw new SystemException("费用因子匹配失败");
+        return null;
+//        throw new SystemException("费用因子匹配失败");
     }
 
 

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -283,6 +283,11 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         PtlAgreementProductCostsNew ptlAgreementProductCostsNew = new PtlAgreementProductCostsNew();
         BeanUtils.copyProperties(agreementProductCosts, ptlAgreementProductCostsNew);
         ptlAgreementProductCostsNew.setId(null);
+        //设置默认优先级为1
+        if(ptlAgreementProductCostsNew.getPriorityLevel() == null)
+        {
+            ptlAgreementProductCostsNew.setPriorityLevel(1);
+        }
         ptlAgreementProductCostsNew.blank();
         int insert = baseMapper.insert(ptlAgreementProductCostsNew);