电销费用修改

src/main/java/com/ydtech/constants/enums/dict/FeeAuditAuditstatus.java

@@ -18,7 +18,7 @@ public enum FeeAuditAuditstatus {
 
     TELEMARKETING_NOT_SUBMITTED("4", "电销未提交", 6, 1),
 
-    TELEMARKETING_AUDIT("5", "电销未提交", 5, 1),
+    TELEMARKETING_AUDIT("5", "电销待审核", 5, 1),
 
     //轨迹中显示 承保信息
     UNDERWRITING("3", "已承保", 4, 1);

src/main/java/com/ydtech/modules/order/controller/InsTelemarketingOrderController.java

@@ -10,10 +10,7 @@ import com.ydtech.modules.order.service.InsTelemarketingOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "电销订单")
 @RequestMapping("/insurance/telemarketing")
@@ -38,6 +35,11 @@ public class InsTelemarketingOrderController {
         return HttpResult.ok();
     }
 
-
+    @PostMapping("/submitAudit/{subOrderNo}")
+    @ApiOperation(value = "提交审核")
+    public HttpResult<Object> submitAudit(@PathVariable String subOrderNo){
+        insTelemarketingOrderService.submitAudit(subOrderNo);
+        return HttpResult.ok();
+    }
 
 }

src/main/java/com/ydtech/modules/order/entity/vo/SubmitExportFeesVo.java

@@ -28,4 +28,7 @@ public class SubmitExportFeesVo {
     @ApiModelProperty("子订单号")
     private String subOrderNo;
 
+    @ApiModelProperty("使用状态 0 使用最开始的费用 1 使用修改状态下的费用")
+    private String state;
+
 }

src/main/java/com/ydtech/modules/order/service/InsTelemarketingOrderService.java

@@ -21,4 +21,9 @@ public interface InsTelemarketingOrderService {
      */
     void submitExportFeesVo(SubmitExportFeesVo submitExportFeesVo);
 
+    /**
+     * 电销审核
+     * @param subOrderNo 子订单id
+     */
+    void submitAudit(String subOrderNo);
 }

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -121,7 +121,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
         if (b) {
             // 电销审核
-            insFeeAuditService.saveDefaultInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), FeeAuditAuditstatus.TELEMARKETING_AUDIT.getCode(), null);
+            insFeeAuditService.saveDefaultInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), FeeAuditAuditstatus.TELEMARKETING_NOT_SUBMITTED.getCode(), null);
         } else if (ptlAgreement.getAuditType() == 2 && insAreaCompany.getOrderstatus().equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode())) {
             //如果为自动审核 则自动进行审核
             insFeeAuditService.feeAudit(insAreaCompany.getOrderno(), insAreaCompany.getId(), true, FeeAuditAuditstatus.PASSED.getCode());

src/main/java/com/ydtech/modules/order/service/impl/InsTelemarketingOrderServiceImpl.java

@@ -64,27 +64,44 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
                 .eq(PtlAgreementProductCostsNew::getId, insFeeOrderNew.getAgreementId())
                 .one();
 
+        String state = submitExportFeesVo.getState();
+        boolean equals = "0".equals(state);
+
         // 保存扣减比例信息
         InsFeeTelemarketing insFeeTelemarketing = new InsFeeTelemarketing(submitExportFeesVo);
         insFeeTelemarketingService.save(insFeeTelemarketing);
 
         // 交强一级管理比例
-        BigDecimal jqExportRadioLevel1 = BigDecimalUtils.transferToBigDecmail(ptlAgreementProductCostsNew.getJqExportRadioLevel1());
+        BigDecimal jqExportRadioLevel1 = getTheScaleBasedOnTheStatus(equals, ptlAgreementProductCostsNew.getJqExportRadioLevel1(), insFeeOrderNew.getJqDeptProportionLevel1());
         BigDecimal jq = jqExportRadioLevel1.add(submitExportFeesVo.getJqExportProportion());
         ptlAgreementProductCostsNew.setJqExportRadioLevel1(String.valueOf(jq));
 
         // 商业一级管理比例
-        BigDecimal syExportRadioLevel1 = BigDecimalUtils.transferToBigDecmail(ptlAgreementProductCostsNew.getSyExportRadioLevel1());
+        BigDecimal syExportRadioLevel1 = getTheScaleBasedOnTheStatus(equals, ptlAgreementProductCostsNew.getSyExportRadioLevel1(), insFeeOrderNew.getSyDeptProportionLevel1());
         BigDecimal sy = syExportRadioLevel1.add(submitExportFeesVo.getSyExportProportion());
         ptlAgreementProductCostsNew.setSyExportRadioLevel1(String.valueOf(sy));
 
         // 非车一级管理比例
-        BigDecimal noCarExportRadioLevel1 = BigDecimalUtils.transferToBigDecmail(ptlAgreementProductCostsNew.getNoCarExportRadioLevel1());
+        BigDecimal noCarExportRadioLevel1 = getTheScaleBasedOnTheStatus(equals, ptlAgreementProductCostsNew.getNoCarExportRadioLevel1(), insFeeOrderNew.getNoDeptProportionLevel1());
         BigDecimal no = noCarExportRadioLevel1.add(submitExportFeesVo.getNoCarExportProportion());
         ptlAgreementProductCostsNew.setNoCarExportRadioLevel1(String.valueOf(no));
 
         // 重新计算比例
         feeRuleSchemeNewService.calcCostsExternal(ptlAgreementProductCostsNew, insAreaCompany);
+
+    }
+
+    public BigDecimal getTheScaleBasedOnTheStatus(boolean b, String s, BigDecimal bigDecimal){
+        if (b) {
+            return BigDecimalUtils.transferToBigDecmail(s);
+        }
+        return bigDecimal;
+    }
+
+
+    @Override
+    public void submitAudit(String subOrderNo) {
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
         insFeeAuditService.saveDefaultInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), FeeAuditAuditstatus.UNREVICEWED.getCode(), null);
     }