修改关闭订单动作

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

@@ -41,6 +41,9 @@ public class InsAreaCompanyController {
     @ApiOperation("关闭订单")
     public HttpResult<String> close(@PathVariable String subOrderNo) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
+        if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insAreaCompany.getOrderstatus())) {
+            throw new SystemException("已承保订单不允许关闭");
+        }
         insAreaCompany.setDelFlag("0");
         insAreaCompanyService.updateById(insAreaCompany);
         return HttpResult.ok();
@@ -50,9 +53,12 @@ public class InsAreaCompanyController {
     @ApiOperation("取消核保")
     public HttpResult<String> cancelUnderwriting(@PathVariable String subOrderNo) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
-        insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
-        insAreaCompanyService.updateById(insAreaCompany);
-        return HttpResult.ok();
+        if (InsOrderStatusEnum.WAIT_PAY.getCode().equals(insAreaCompany.getOrderstatus())) {
+            insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
+            insAreaCompanyService.updateById(insAreaCompany);
+            return HttpResult.ok();
+        }
+        throw new SystemException("只有[已核保待缴费]状态下允许取消核保");
     }
 
     @GetMapping("/statusRestored/{subOrderNo}")

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.aop.request.RequestSingleParam;
+import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
@@ -175,7 +176,7 @@ public class InsOrdersController extends BaseController {
 
         List<String> insAreaCompanyIdList = insAreaCompanies.stream().map(InsAreaCompany::getId).collect(Collectors.toList());
         List<InsAreaCompanyHistoryVo> collect = new ArrayList<>();
-        if(!insAreaCompanyIdList.isEmpty()) {
+        if (!insAreaCompanyIdList.isEmpty()) {
             List<InsFeeOrderNew> list = insFeeOrderNewService.lambdaQuery().in(InsFeeOrderNew::getInsOrderNo, insAreaCompanyIdList).list();
             Map<String, InsFeeOrderNew> insFeeOrderNewMap = list.stream().collect(Collectors.toMap(InsFeeOrderNew::getInsOrderNo, x -> x));
 
@@ -519,15 +520,15 @@ public class InsOrdersController extends BaseController {
 
     @PostMapping("/queryLicenseInOrder")
     @ApiOperation(value = "查询订单中的车牌")
-    public HttpResult<List<String>> queryLicenseInOrder(@RequestBody QueryLicenseInOrderVo queryLicenseInOrderVo){
-        List<String> licenseList =  insOrdersService.queryLicenseInOrder(queryLicenseInOrderVo);
+    public HttpResult<List<String>> queryLicenseInOrder(@RequestBody QueryLicenseInOrderVo queryLicenseInOrderVo) {
+        List<String> licenseList = insOrdersService.queryLicenseInOrder(queryLicenseInOrderVo);
         return HttpResult.ok(licenseList);
     }
 
     @PostMapping("/queryInsuredInOrder")
     @ApiOperation(value = "查询订单中的被保人")
-    public HttpResult<List<String>> queryInsuredInOrder(@RequestBody QueryLicenseInOrderVo queryInsuredInOrderVo){
-        List<String> insured =  insOrdersService.queryInsuredInOrder(queryInsuredInOrderVo);
+    public HttpResult<List<String>> queryInsuredInOrder(@RequestBody QueryLicenseInOrderVo queryInsuredInOrderVo) {
+        List<String> insured = insOrdersService.queryInsuredInOrder(queryInsuredInOrderVo);
         return HttpResult.ok(insured);
     }
 
@@ -535,6 +536,9 @@ public class InsOrdersController extends BaseController {
     @ApiOperation(value = "关闭订单")
     public HttpResult shutDown(@PathVariable String orderNo) {
         InsOrders insOrders = insOrdersService.getById(orderNo);
+        if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insOrders.getOrderstatus())) {
+            throw new SystemException("已承保订单不允许关闭");
+        }
         insOrders.setDelFlag("0");
         boolean b = insOrdersService.updateById(insOrders);
         AssertionUtils.isSucceed(b, "关闭订单失败");