提交代码

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

@@ -0,0 +1,41 @@
+package com.ydtech.modules.order.controller;
+
+
+import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.service.InsAreaCompanyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/subOrder")
+@Api(tags = "子订单")
+@Slf4j
+@RequiredArgsConstructor
+public class InsAreaCompanyController {
+
+    private final InsAreaCompanyService insAreaCompanyService;
+
+    @GetMapping("/close/{subOrderNo}")
+    @ApiOperation("关闭订单")
+    public HttpResult<String> close(@PathVariable String subOrderNo) {
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
+        insAreaCompany.setDelFlag("0");
+        insAreaCompanyService.updateById(insAreaCompany);
+        return HttpResult.ok();
+    }
+
+    @GetMapping("/cancelUnderwriting/{subOrderNo}")
+    @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();
+    }
+
+}

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

@@ -61,8 +61,6 @@ public class InsOrdersController extends BaseController {
 
     private final InsAreaCompanyPositionService insAreaCompanyPositionService;
 
-
-
     @Value("${upload.file.path}")
     private String uploadPath;
 
@@ -97,7 +95,7 @@ public class InsOrdersController extends BaseController {
     public HttpResult<InsOrders> generateOrder(@Validated @RequestBody BaseQuoteInfoVo quoteInfoVo) {
         SysUser user = getUser();
         //app 订单取消了商业险信息
-        if(Objects.isNull(quoteInfoVo.getKindList())){
+        if (Objects.isNull(quoteInfoVo.getKindList())) {
             quoteInfoVo.setKindList(new ArrayList<>());
         }
 
@@ -161,9 +159,12 @@ public class InsOrdersController extends BaseController {
     public HttpResult<List<InsAreaCompanyHistoryVo>> queryQuoteHistory(@RequestBody QuoteHistoryVo quoteHistoryVo) {
         InsOrders insOrders = this.insOrdersService.existOrder(quoteHistoryVo.getOrderNo());
 
-        LambdaQueryWrapper<InsAreaCompany> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderNo()), InsAreaCompany::getOrderno, quoteHistoryVo.getOrderNo()).eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderStatus()), InsAreaCompany::getOrderstatus, quoteHistoryVo.getOrderStatus()).orderByDesc(InsAreaCompany::getCreatetime);
-        List<InsAreaCompany> insAreaCompanies = this.insAreaCompanyService.getBaseMapper().selectList(wrapper);
+        List<InsAreaCompany> insAreaCompanies = this.insAreaCompanyService.lambdaQuery()
+                .eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderNo()), InsAreaCompany::getOrderno, quoteHistoryVo.getOrderNo())
+                .eq(!ObjectUtils.isEmpty(quoteHistoryVo.getOrderStatus()), InsAreaCompany::getOrderstatus, quoteHistoryVo.getOrderStatus())
+                .eq(InsAreaCompany::getDelFlag, "1")
+                .orderByDesc(InsAreaCompany::getCreatetime)
+                .list();
 
         List<InsAreaCompanyHistoryVo> collect = insAreaCompanies.stream().map(a -> {
             InsAreaCompanyHistoryVo insAreaCompanyHistoryVo = new InsAreaCompanyHistoryVo();

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -507,13 +507,17 @@ public class InsAreaCompany implements Serializable {
 
     /**
      * @see com.ydtech.modules.order.constants.PcPhoneStatus
-     *  报价状态  0 pc   1.app
+     * 报价状态  0 pc   1.app
      */
     @TableField("order_source")
     private Integer orderSource;
 
-     @TableField(value = "del_flag")
-     private String delFlag;
+    /**
+     * 0 删除 1 正常
+     * 删除订单
+     */
+    @TableField(value = "del_flag")
+    private String delFlag;
 
     public InsAreaCompany(QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution) {
         this.id = IdGenerate.nextId();