Merge remote-tracking branch 'origin/test' into test

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

@@ -125,6 +125,11 @@ 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);
             }
         }
     }

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) {
+                if (insFeeOrderNew != null && insFeeOrderNew.getCostsId() != null) {
                     //出口
                     SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
 

src/main/java/com/ydtech/modules/protocols/entity/po/InsFeeOrderNew.java

@@ -380,4 +380,12 @@ public class InsFeeOrderNew {
     @ApiModelProperty(value = "预收跟单费")
     @TableField(exist = false)
     private String amountType;
+
+    public void createEmpty(String insOrderNo,String agreementId,String userId,String deptId){
+        this.setInsOrderNo(insOrderNo);
+        this.setCostsId(null);
+        this.setAgreementId(agreementId);
+        this.setDeptId(deptId);
+        this.setUserId(userId);
+    }
 }

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

@@ -51,6 +51,12 @@ public class InsFeeOrderNewServiceImpl extends ServiceImpl<InsFeeOrderNewMapper,
         return baseMapper.getByUserIdAndOrderStatusAndNoCheck(userId);
     }
 
+    /**
+     * 更新一级机构管理费用
+     * @param insOrderNo
+     * @param jqPremium
+     * @return
+     */
     @Override
     public boolean updateLevelDeptManager(String insOrderNo, BigDecimal jqPremium, BigDecimal syPremium, BigDecimal noPremium) {
         InsFeeOrderNew insFeeOrderNew = baseMapper.selectOne(new LambdaQueryWrapper<InsFeeOrderNew>()