1.疑问订单处理

2.渤海订单处理

src/main/java/com/ydtech/modules/fnc/controller/CarSettleController.java

@@ -5,6 +5,7 @@ import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
 import com.ydtech.modules.fnc.entity.InsFeeAudit;
@@ -38,19 +39,17 @@ public class CarSettleController extends BaseController {
     private final InsAreaCompanyService insAreaCompanyService;
 
     private final InsFeeAuditService insFeeAuditService;
-    private final FeeRuleSchemeService feeRuleSchemeService;
 
     private final InsFeeAuditHistoryService insFeeAuditHistoryService;
 
 
     public CarSettleController(InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService,
-                               InsFeeAuditService insFeeAuditService, FeeRuleSchemeService feeRuleSchemeService,
+                               InsFeeAuditService insFeeAuditService,
                                InsFeeAuditHistoryService insFeeAuditHistoryService) {
 
         this.insAreaCompanyService = insAreaCompanyService;
         this.insOrdersService = insOrdersService;
         this.insFeeAuditService = insFeeAuditService;
-        this.feeRuleSchemeService = feeRuleSchemeService;
         this.insFeeAuditHistoryService = insFeeAuditHistoryService;
 
     }
@@ -115,10 +114,15 @@ public class CarSettleController extends BaseController {
 //                    feeRuleSchemeService.compareAndUpdateFeeOrderInfo(areaList.get(0).getId(), auditOrderFeeVo.getJqCostsProportionStr(),
 //                            auditOrderFeeVo.getSyCostsProportionStr(), userId);
 //                }
+                String problemOrder = areaList.get(0).getProblemOrder();
+                if ("1".equals(problemOrder)) {
+                    throw new SystemException("疑问订单不允许审核");
+                }
+
                 //审核通过
-                if(auditOrderFeeVo.getAuditStatus().equals("1")) {
+                if (auditOrderFeeVo.getAuditStatus().equals("1")) {
                     insFeeAuditService.feeAudit(orderNo, areaList.get(0).getId(), false, FeeAuditAuditstatus.PASSED.getCode());
-                }else if(auditOrderFeeVo.getAuditStatus().equals("0") || auditOrderFeeVo.getAuditStatus().equals("2")) {
+                } else if (auditOrderFeeVo.getAuditStatus().equals("0") || auditOrderFeeVo.getAuditStatus().equals("2")) {
                     insFeeAuditService.saveDefaultInsFeeAuditAndHistory(orderNo, areaList.get(0).getId(),
                             auditOrderFeeVo.getAuditStatus(), auditOrderFeeVo.getRejectinfo());
                 }
@@ -159,12 +163,14 @@ public class CarSettleController extends BaseController {
 
     /**
      * 标注疑问订单
+     *
      * @return
      */
     @PostMapping("markProblemOrder")
     @ApiOperation("标注疑问订单")
-    public HttpResult<Object> markProblemOrder(@RequestBody ProblemOrderQueryVo problemOrderQueryVo){
+    public HttpResult<Object> markProblemOrder(@RequestBody ProblemOrderQueryVo problemOrderQueryVo) {
         return insAreaCompanyService.markProblemOrder(problemOrderQueryVo) ? HttpResult.ok("标注成功")
                 : HttpResult.error("标注失败");
     }
+
 }

src/main/java/com/ydtech/modules/order/components/bohai/BoHaiRequestApiComponent.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.ydtech.config.properties.BohaiApiConfigurationProperties;
 import com.ydtech.constants.InsuranceEnum;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.order.entity.api.bohai.BoHaiEncrypted;
 import com.ydtech.modules.order.entity.api.bohai.constants.RequestType;
@@ -171,7 +172,7 @@ public class BoHaiRequestApiComponent {
      * @return 响应
      */
     public QuotationResponse quotation(QuotationRequest request, String sysSourceCode) throws Exception {
-        return verificationResponse(request, properties.getUrl(), QuotationResponse.class, sysSourceCode, RequestType.Z00006);
+        return post(request, properties.getUrl(), QuotationResponse.class, sysSourceCode, RequestType.Z00006);
     }
 
     /**
@@ -181,7 +182,7 @@ public class BoHaiRequestApiComponent {
      * @return 响应
      */
     public UnderwritingResponse underwriting(UnderwritingRequest underwritingRequest, String sysSourceCode) throws Exception {
-        return post(underwritingRequest, properties.getUrl(), UnderwritingResponse.class, sysSourceCode, RequestType.Z00007);
+        return verificationResponse(underwritingRequest, properties.getUrl(), UnderwritingResponse.class, sysSourceCode, RequestType.Z00007);
     }
 
     /**
@@ -191,7 +192,7 @@ public class BoHaiRequestApiComponent {
      * @return 响应
      */
     public PaymentResponse payment(PaymentRequest paymentRequest, String sysSourceCode) throws Exception {
-        return post(paymentRequest, properties.getUrl(), PaymentResponse.class, sysSourceCode, RequestType.Z00008);
+        return verificationResponse(paymentRequest, properties.getUrl(), PaymentResponse.class, sysSourceCode, RequestType.Z00008);
     }
 
     /**
@@ -223,9 +224,9 @@ public class BoHaiRequestApiComponent {
      * @param responseMsg  响应内容
      */
     private void verificationResponseCode(String responseCode, String responseMsg) {
-        //if (ResponseCode.R_Z00004.getCode().equals(responseCode)) {
-        //    throw new SystemException(responseMsg);
-        //}
+        if (ResponseCode.R_Z00004.getCode().equals(responseCode)) {
+            throw new SystemException(responseMsg);
+        }
     }
 
     /**