Преглед изворни кода

修改空费用 核保判断

785834757 пре 2 година
родитељ
комит
18154176b3

+ 0 - 5
src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -125,11 +125,6 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
             if(costsId != null) {
                 calcCosts(costsId, insAreaCompany);
                 log.debug("费用因子校验通过,子订单id:" + insAreaCompany.getId() + ",费用id:" + costsId);
-            }else{
-                //新增一条0费用的数据
-                InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
-                insFeeOrderNew.createEmpty(insAreaCompany.getId(),insAreaCompany.getAgreementId(),insOrders.getUserid(),insOrders.getDeptid());
-                insFeeOrderNewService.save(insFeeOrderNew);
             }
         }
     }

+ 1 - 1
src/main/java/com/ydtech/modules/order/aop/aspect/AuditVerificationAspect.java

@@ -68,7 +68,7 @@ public class AuditVerificationAspect {
             InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
             //查找费用 找不到则抛出异常
             InsFeeOrderNew insFeeOrderNewByCompanyId = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(companyId);
-            if(insFeeOrderNewByCompanyId == null && insFeeOrderNewByCompanyId.getCostsId() == null){
+            if(insFeeOrderNewByCompanyId == null){
                 throw new SystemException("费用信息不匹配");
             }
             PtlAgreementProductCostsNew costsNew = ptlAgreementProductCostsNewService.getById(insFeeOrderNewByCompanyId.getCostsId());

+ 1 - 1
src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java

@@ -92,7 +92,7 @@ public class QuoteVerificationAspect {
             try {
                 feeRuleSchemeNewService.verificationCostFactor(insAreaCompany, insOrders);
                 InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(insAreaCompany.getId());
-                if (insFeeOrderNew != null && insFeeOrderNew.getCostsId() != null) {
+                if (insFeeOrderNew != null) {
                     //出口
                     SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);