订单添加人工核保和自动核保的订单轨迹

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

@@ -95,6 +95,14 @@ public class InsOrdersTrack implements Serializable {
     @ApiModelProperty("备注")
     private String remark;
 
+    /***
+     *  人工核保  1 ，自动核保  2.人工核保
+     *  更新状态   1.手动更新  2. 自动更新
+     */
+    @TableField(value = "order_type")
+    @ApiModelProperty("类型")
+    private String orderType;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 

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

@@ -380,8 +380,9 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             return HttpResult.ok("核保通过");
         } else if (i == 2) {
             //  add  by  hxl  添加自动更新状态
-            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
             insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
+            //insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
         } else {
             //  add  by  hxl  添加自动更新状态

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

@@ -586,9 +586,10 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                 }
                 if ("1".equals(odr1010Response.getResult().getJqAppStatus()) || "1".equals(odr1010Response.getResult().getSyAppStatus())) {
                     //  add  by  hxl  添加自动更新状态
+                    insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
                     insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
                     //修改状态 转人工
-                    insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
+                   // insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
                     String message = "";
                     String jqAppStatusMessage = odr1010Response.getResult().getJqAppStatusMessage();

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

@@ -380,18 +380,23 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
         }
         //  add  by  hxl  添加自动更新状态
-        insSubOrderUpdateDetailService.insertData(iac,oldStatus,iac.getOrderstatus(),"1");
+        //insSubOrderUpdateDetailService.insertData(iac,oldStatus,iac.getOrderstatus(),"1");
         if (iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_AUDIT.getCode())) {
             iac.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(iac,oldStatus,iac.getOrderstatus(),"1");
             insAreaCompanyService.updateCompanyAndOrdersMessage(iac, message);
             return HttpResult.error(message);
         }
 
         if (iac.getOrderstatus().equals(InsOrderStatusEnum.TO_BACK.getCode())) {
+            //  add  by  hxl  添加自动更新状态
+            //insSubOrderUpdateDetailService.insertData(iac,oldStatus,iac.getOrderstatus(),"1");
             insAreaCompanyService.updateCompanyAndOrdersMessage(iac, message);
             return HttpResult.error(message);
         }
-
+        //  add  by  hxl  添加自动更新状态
+        insSubOrderUpdateDetailService.insertData(iac,oldStatus,iac.getOrderstatus(),"1");
         InsUtils.buildOrderStatus(order, iac);
         if (iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_PAY.getCode())) {
             //获取签名地址

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

@@ -269,8 +269,9 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
                 return getPayURL(insAreaCompany, huaTaiConfigureParameters);
             } else if ("9".equals(huaTaiSubmitCommon.getTotalUnderWriteInd())) {//待核保
                 //  add  by  hxl  添加自动更新状态
-                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
                 insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
+                //insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
                 insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
                 return HttpResult.ok("已转人工核保");

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

@@ -217,8 +217,9 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         // 是否人工核保
         if (StringUtils.isNotEmpty(crawlerAuditResponse.getManual())) {
             //  add  by  hxl  添加自动更新状态
-            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
             insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
+            //insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
             String message = crawlerAuditResponse.getMessage();
             insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, message);

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

@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
@@ -95,8 +97,28 @@ public class InsSubOrderUpdateDetailServiceImpl extends ServiceImpl<InsSubOrderU
                 this.save(detail);
             }
             InsAreaCompany old = insAreaCompanyService.getById(subOrder.getId());
+
+            //插入轨迹表
+            InsOrdersTrack insOrdersTrack = new InsOrdersTrack(subOrder.getId(), subOrder.getCompanyId(), subOrder.getInscompany(), subOrder.getOrderno(), newStatus, new BaseController().getUser().getId(), new BaseController().getUser().getName(),updateRemark);
+            //如果是人工核保更新人工核保时间,出入轨迹表
+            if(InsOrderStatusEnum.QUOTE_ING.getCode().equals(oldStatus) &&  InsOrderStatusEnum.WAIT_AUDIT.getCode().equals(newStatus)){
+                //插入轨迹表
+                insOrdersTrack.setOrderType("2");
+                insOrdersTrack.setOrderStatus("人工核保");
+                insOrdersTrackService.save(insOrdersTrack);
+                LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+                insOrdersTrack.setCreateTime(localDateTime);
+                //更新核保时间
+                old.setUnderwritingTime(date);
+                insAreaCompanyService.updateById(old);
+            }
             //如果是状态为核保待缴费插入轨迹表
             if(InsOrderStatusEnum.WAIT_AUDIT.getCode().equals(oldStatus) &&  InsOrderStatusEnum.WAIT_PAY.getCode().equals(newStatus)){
+                insOrdersTrack.setOrderType("1");
+                insOrdersTrack.setOrderStatus("自动核保");
+                LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+                insOrdersTrack.setCreateTime(localDateTime);
+                insOrdersTrackService.save(insOrdersTrack);
                 //更新核保时间
                 old.setUnderwritingTime(date);
                 insAreaCompanyService.updateById(old);
@@ -104,7 +126,9 @@ public class InsSubOrderUpdateDetailServiceImpl extends ServiceImpl<InsSubOrderU
             //如果是状态为核保待缴费插入轨迹表
             if(InsOrderStatusEnum.WAIT_PAY.getCode().equals(oldStatus) &&  InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(newStatus)){
                 //插入轨迹表
-                InsOrdersTrack insOrdersTrack = new InsOrdersTrack(subOrder.getId(), subOrder.getCompanyId(), subOrder.getInscompany(), subOrder.getOrderno(), newStatus, new BaseController().getUser().getId(), new BaseController().getUser().getName(),updateRemark);
+                insOrdersTrack.setOrderType(updateMethod);
+                LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+                insOrdersTrack.setCreateTime(localDateTime);
                 insOrdersTrackService.save(insOrdersTrack);
                 //更新状态   更新时间
                 old.setUpdateStatusTime(date);

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

@@ -120,6 +120,9 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
 
 
     private final  PinganRecordService  pinganRecordService;
+
+
+    private final  InsSubOrderUpdateDetailService  insSubOrderUpdateDetailService;
     /**
      * @Description 获取财意险险种套餐列表  调用 4.4
      * @Author hxl
@@ -1029,14 +1032,20 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                         url = signEleApplyResponse.getResultMessage();
                     }
                     insAreaCompany.setPaymentLink(url);
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
                 }else if((OrderStatusCodeEnum.ORDER_STATUS_CODE_BH.getCode().equals(status) || OrderStatusCodeEnum.ORDER_STATUS_CODE_BE.getCode().equals(status)
                         ||  OrderStatusCodeEnum.ORDER_STATUS_CODE_B1.getCode().equals(status)  || OrderStatusCodeEnum.ORDER_STATUS_CODE_B6.getCode().equals(status) )  && ("0".equals(insAreaCompany.getOrderstatus()))){
                     // 待验车 BH 资料人工审核-BE B1 B6
                     insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
                 }else if(OrderStatusCodeEnum.ORDER_STATUS_CODE_B4.getCode().equals(status)){
                     //变为核保退回
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.TO_BACK.getCode(),"1");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
                 }
 
@@ -1283,6 +1292,8 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                     if (insAreaCompany.getPayDate() == null) {
                         insAreaCompany.setPayDate(LocalDateTime.now());
                     }
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                     insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
                     return HttpResult.ok("承保成功");
@@ -1424,6 +1435,8 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                     if (insAreaCompany.getPayDate() == null) {
                         insAreaCompany.setPayDate(LocalDateTime.now());
                     }
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                     insAreaCompanyService.updateCompanyAndOrdersNew(insAreaCompany);
                 }
@@ -1697,10 +1710,14 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                         url = signEleApplyResponse.getResultMessage();
                     }
                     insAreaCompany.setPaymentLink(url);
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode() );
                     insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
                 }else if(OrderStatusCodeEnum.ORDER_STATUS_CODE_B5.getCode().equals(status) && ("0".equals(insAreaCompany.getOrderstatus()) || "1".equals(insAreaCompany.getOrderstatus()) || "2".equals(insAreaCompany.getOrderstatus()))) {
                     //承保
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                     insAreaCompany.setPayDate(LocalDateTime.now());
                     insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
@@ -1708,9 +1725,13 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                 }else if(OrderStatusCodeEnum.ORDER_STATUS_CODE_BH.getCode().equals(status) || OrderStatusCodeEnum.ORDER_STATUS_CODE_BE.getCode().equals(status)
                         ||  OrderStatusCodeEnum.ORDER_STATUS_CODE_B1.getCode().equals(status)  || OrderStatusCodeEnum.ORDER_STATUS_CODE_B6.getCode().equals(status)){
                     // 待验车 BH 资料人工审核-BE B1 B6
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
                 }else if(OrderStatusCodeEnum.ORDER_STATUS_CODE_B4.getCode().equals(status)){
                     //变为核保退回
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.TO_BACK.getCode(),"1");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
                 }
             }
@@ -2322,10 +2343,14 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                 logger.info(documentStatusListResponse.toString()+"调用状态查询接口");
                 if(OrderStatusCodeEnum.ORDER_STATUS_CODE_B2.getCode().equals(status) && ("0".equals(insAreaCompany.getOrderstatus()) || "1".equals(insAreaCompany.getOrderstatus()) )){
                     //说明核保成功，更新大订单和小订单的状态为1  更新为已核保待缴费
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"2");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode() );
                     insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
                 }else if(OrderStatusCodeEnum.ORDER_STATUS_CODE_B5.getCode().equals(status) && ("0".equals(insAreaCompany.getOrderstatus()) || "1".equals(insAreaCompany.getOrderstatus()) || "2".equals(insAreaCompany.getOrderstatus()))) {
                     //承保
+                    //  add  by  hxl  添加手动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"2");
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                     insAreaCompany.setPayDate(LocalDateTime.now());
                     insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);

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

@@ -240,9 +240,10 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
                 zmConfigureParameters);
         // 3. 人工核保
         if (SubmitStatus.S_3.getCode().equals(response.getSubmitStatus())) {
+            insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
             //  add  by  hxl  添加手动更新状态
             insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
-            insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
+            //insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
             String message = response.getSubmitNotion();
             insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, message);

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

@@ -233,12 +233,16 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             String uwMsg = systemException.getMessage();
 
             if (OrderStatusEnum.O_3.getCode().equals(resultObj.getOrderStatus())) {
+                //  add  by  hxl  添加手动更新状态
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.TO_BACK.getCode(),"1");
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
                 insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, uwMsg);
                 return HttpResult.error(OrderStatusEnum.O_3.getName() + ":" + uwMsg);
                 // 人工核保
             } else if (OrderStatusEnum.O_1.getCode().equals(resultObj.getOrderStatus())) {
                 insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
+                //  add  by  hxl  添加手动更新状态
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
                 insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, uwMsg);
                 return HttpResult.error("人工核保" + ":" + uwMsg);