修改报价完成后订单状态刷新

src/main/java/com/ydtech/modules/ins/model/InsOrdersExcel.java

@@ -72,8 +72,6 @@ public class InsOrdersExcel{
     @ExcelProperty(value = "车主手机号")
     private String ownerMobile;
 
-
-
     @ExcelIgnore
     private JSONObject applyInfo;
 
@@ -89,20 +87,19 @@ public class InsOrdersExcel{
     @ExcelProperty(value = "投保人手机号")
     private String applyMobile;
 
-
     @ExcelIgnore
     private JSONObject insureInfo;
 
-    @ExcelProperty(value = "投保人姓名")
+    @ExcelProperty(value = "被保险人姓名")
     private String insureName;
 
-    @ExcelProperty(value = "投保人身份证号")
+    @ExcelProperty(value = "被保险人身份证号")
     private String insureIdentifyNumber;
 
-    @ExcelProperty(value = "投保人年龄")
+    @ExcelProperty(value = "被保险人年龄")
     private String insureAge;
 
-    @ExcelProperty(value = "投保人手机号")
+    @ExcelProperty(value = "被保险人手机号")
     private String insureMobile;
 
     @ExcelIgnore
@@ -156,6 +153,4 @@ public class InsOrdersExcel{
     @ExcelProperty(value = "商业赔付率")
     private String syLossRation;
 
-
-
 }

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

@@ -5,6 +5,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.InsOrdersExcelVo;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.vo.*;
@@ -41,11 +42,9 @@ public interface InsOrdersService extends IService<InsOrders> {
     /**
      * 修改订单状态
      *
-     * @param orderNo
-     * @param orderStatus
      * @return
      */
-    void updateByOrderStatus(String orderNo, String orderStatus);
+    void updateByOrderStatus(InsAreaCompany insAreaCompany);
 
     /**
      * 判断订单是否存在

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

@@ -54,14 +54,14 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     public void updateCompanyAndOrders(InsAreaCompany insAreaCompany) {
         baseMapper.updateById(insAreaCompany);
         insOrdersTrackService.addingTrajectories(insAreaCompany);
-        insOrdersService.updateByOrderStatus(insAreaCompany.getOrderno(), insAreaCompany.getOrderstatus());
+        insOrdersService.updateByOrderStatus(insAreaCompany);
     }
 
     @Override
     public void insertCompanyAndOrders(InsAreaCompany insAreaCompany) {
         baseMapper.insert(insAreaCompany);
         insOrdersTrackService.addingTrajectories(insAreaCompany);
-        insOrdersService.updateByOrderStatus(insAreaCompany.getOrderno(), insAreaCompany.getOrderstatus());
+        insOrdersService.updateByOrderStatus(insAreaCompany);
     }
 
     @Override

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

@@ -130,29 +130,30 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     }
 
     @Override
-    public void updateByOrderStatus(String orderNo, String orderStatus) {
-        if (InsOrderStatusEnum.TO_BACK.getCode().equals(orderStatus)) {
+    public void updateByOrderStatus(InsAreaCompany insAreaCompany) {
+        if (InsOrderStatusEnum.TO_BACK.getCode().equals(insAreaCompany.getOrderstatus())) {
             return;
         }
 
-        // 查出最新状态的子订单修改
-        InsAreaCompany insAreaCompany = insAreaCompanyService.queryLatestStatus(orderNo);
         if (!ObjectUtils.isEmpty(insAreaCompany)) {
-            InsOrders insOrders = getById(orderNo);
-            if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insOrders.getOrderstatus())) {
-                return;
-            }
+            InsOrders insOrders = getById(insAreaCompany.getOrderno());
 
-            // 承保设置保险公司
-            if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(orderStatus)) {
+            if (!InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insAreaCompany.getOrderstatus())) {
+                // 查出最新状态的子订单修改
+                insAreaCompany = insAreaCompanyService.queryLatestStatus(insAreaCompany.getOrderno());
+            }else {
                 insOrders.setCompanyId(insAreaCompany.getCompanyId());
                 insOrders.setInsCompany(insAreaCompany.getInscompany());
             }
 
+            if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insOrders.getOrderstatus())) {
+                return;
+            }
+
             insOrders.setOrderstatus(insAreaCompany.getOrderstatus());
             LambdaQueryWrapper<InsOrders> insOrdersLambdaQueryWrapper = new LambdaQueryWrapper<>();
             insOrdersLambdaQueryWrapper.ne(InsOrders::getOrderstatus, InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
-            insOrdersLambdaQueryWrapper.eq(InsOrders::getOrderno, orderNo);
+            insOrdersLambdaQueryWrapper.eq(InsOrders::getOrderno, insAreaCompany.getOrderno());
             update(insOrders, insOrdersLambdaQueryWrapper);
         }
     }
@@ -383,8 +384,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersExcel.setSeatCount(carInfo.getString("seatCount"));
             insOrdersExcel.setTransferFlag(carInfo.getString("transferFlag").equals("true") ? "是" : "否");
             insOrdersExcel.setTransferFlagBi(carInfo.getString("noLicenseFlag").equals("true") ? "是" : "否");
-            insOrdersExcel.setRegisterDate("registerDate");
-            insOrdersExcel.setIssueDate("issueDate");
+            insOrdersExcel.setRegisterDate(carInfo.getString("registerDate"));
+            insOrdersExcel.setIssueDate(carInfo.getString("issueDate"));
             // 设置车主信息
             JSONObject ownerInfo = insOrdersExcel.getOwnerInfo();
             insOrdersExcel.setOwnerName(ownerInfo.getString("name"));

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

@@ -431,8 +431,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
                 insAreaCompany.setSyapplyno(syApplyno == null ? "" : syApplyno);
                 insAreaCompany.setJqappoint(""); //交强特别约定
                 insAreaCompany.setSyappoint(""); //商业特别约定
-                insAreaCompanyService.updateById(insAreaCompany);
-                insOrdersService.updateByOrderStatus(orders.getOrderno(), orderstatus);
+                insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
 
             }
             log.info("===永安--核保成功===");
@@ -647,8 +646,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());//7 已承保
 //            insAreaCompany.setPaytype(payAppNo);
 //            insAreaCompany.setPaytime(payTime);
-            insAreaCompanyService.updateById(insAreaCompany);
-            insOrdersService.updateByOrderStatus(insAreaCompany.getOrderno(), insAreaCompany.getOrderstatus());
+            insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
         } else {
             log.error("生成保单失败：crstTxt--" + crstTxt + "||crstMsg--" + crstMsg);
         }

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

@@ -162,8 +162,7 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
             insAreaCompany.setPaymentLink(epolicyUrlImg);
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode()); // 2
         }
-        insAreaCompanyService.updateById(insAreaCompany);
-        insOrdersService.updateByOrderStatus(insAreaCompany.getOrderno(), insAreaCompany.getOrderstatus());
+        insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
 
         if (InsOrderStatusEnum.TO_BACK.getCode().equals(insAreaCompany.getOrderstatus())) {
             return HttpResult.error(body.getMessage());
@@ -187,8 +186,7 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         insAreaCompany.setAuditid(insOrders.getUserid());
         insAreaCompany.setPaymentLink(epolicyUrlImg);
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode()); // 5
-        insAreaCompanyService.updateById(insAreaCompany);
-        insOrdersService.updateByOrderStatus(insAreaCompany.getOrderno(), insAreaCompany.getOrderstatus());
+        insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
         return HttpResult.ok();
     }
 
@@ -214,8 +212,7 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());//已承保
         //  order.setPaytype(payAppNo);
         //  order.setPaytime(payTime);
-        insAreaCompanyService.updateById(insAreaCompany);
-        insOrdersService.updateByOrderStatus(insAreaCompany.getOrderno(), insAreaCompany.getOrderstatus());
+        insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
         //  insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.PAID, order);
         //  insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.COVERED, order);
         return HttpResult.ok("成功");

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -130,7 +130,7 @@
         <result property="syScore" column="sy_score" jdbcType="VARCHAR"/>
         <result property="jqLossRation" column="jq_loss_ration" jdbcType="VARCHAR"/>
         <result property="syLossRation" column="sy_loss_ration" jdbcType="VARCHAR"/>
-        <result property="insCompany" column="ins_company" jdbcType="VARCHAR"/>
+        <result property="insCompany" column="inscompany" jdbcType="VARCHAR"/>
         <result property="userId" column="userid" jdbcType="VARCHAR"/>
         <result property="userName" column="username" jdbcType="VARCHAR"/>
         <result property="applyInfo" column="applyinfo" javaType="com.alibaba.fastjson.JSONObject"
@@ -361,7 +361,7 @@
             b.jq_loss_ration,
             b.sy_loss_ration,
             b.score,
-            b.ins_company,
+            b.inscompany,
             a.userid,
             a.username,
             a.applyinfo,