Explorar el Código

添加轨迹表

hxl13994548489 hace 1 año
padre
commit
0c422ad54d

+ 3 - 0
src/main/java/com/ydtech/constants/enums/dict/InsOrderStatusEnum.java

@@ -26,6 +26,9 @@ public enum InsOrderStatusEnum implements IBaseEnum {
 
     //人工核保退回状态,直至再次提交核保,状态修改为待核保
     TO_BACK("4", "核保退回", 6, 0),
+
+    UPDATE_BACK("状态更新", "状态更新", 7, 0)
+
     //撤回二维码
 //    BACK_QR_CODE("5", "撤销二维码", 7, 0),
     ;

+ 22 - 2
src/main/java/com/ydtech/modules/order/service/impl/BoHaiOrderApiServiceImpl.java

@@ -34,6 +34,7 @@ import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.DateUtil_N;
 import com.ydtech.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -66,6 +67,11 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
 
     private final InsDrivingIntentionInsuranceService insDrivingIntentionInsuranceService;
 
+    @Autowired
+    private InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
+
+
     @Override
     public HttpResult<List<NonAutomotiveProductsResponse.DataDTO.ProductsDTO>> productQuery(ProductQueryVo productQueryVo) throws Exception {
         // 账号信息
@@ -362,6 +368,8 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         insAreaCompany.setCrossInsurance(objects);
 
         if (i == 1) {
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             // 支付请求
             PaymentRequest paymentRequest = new PaymentRequest(parameters, insAreaCompany.getId(), insAreaCompany.getInsOrderNo());
@@ -371,9 +379,13 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             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());
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
         } else {
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.TO_BACK.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
         }
         String trafficResultMsg = data.getTrafficResultMsg();
@@ -442,7 +454,8 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
                     insAreaCompany.setJqpolicyno(documentListDTO.getPolicyNo());
                 }
             }
-
+            //  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("承保成功");
@@ -460,6 +473,8 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             // 支付请求
             String payUrl = getQrCodeUrl(insAreaCompany);
             insAreaCompany.setPaymentLink(payUrl);
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.ok("人工核保成功");
@@ -476,6 +491,8 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             String busUniqueId = coverageRequest.getBusUniqueId();
             InsAreaCompany insAreaCompany = insAreaCompanyService.getByInsOrderNo(busUniqueId);
             if (PayResult.P_1.getCode().equals(coverageRequest.getPayResult())) {
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                 insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             }
@@ -501,6 +518,8 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             if (collect.size() == underwritingBacks.size()) {
                 String payUrl = getQrCodeUrl(insAreaCompany);
                 insAreaCompany.setPaymentLink(payUrl);
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
                 insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             }
@@ -712,7 +731,8 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
                     insAreaCompany.setJqpolicyno(documentListDTO.getPolicyNo());
                 }
             }
-
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
             insAreaCompanyService.updateCompanyAndOrdersNew(insAreaCompany);
         }

+ 15 - 0
src/main/java/com/ydtech/modules/order/service/impl/DaJiaOrderServiceImpl.java

@@ -113,6 +113,9 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
     @Value("${api.url}")
     private String apiUrl;
 
+    @Autowired
+    private InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
     //region 报价
 
     /**
@@ -582,6 +585,8 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                     }
                 }
                 if ("1".equals(odr1010Response.getResult().getJqAppStatus()) || "1".equals(odr1010Response.getResult().getSyAppStatus())) {
+                    //  add  by  hxl  添加自动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
                     //修改状态 转人工
                     insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
@@ -612,6 +617,8 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
 
                 }
                 if (payNo.getStatus().equals(Message.M0000.getCode())) {
+                    //  add  by  hxl  添加自动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
                     //获取支付二维码成功  保存支付二维码
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
                     insAreaCompany.setPaymentLink(payNo.getResult().getSignInfoUrl());
@@ -720,6 +727,8 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                 if (checkArtificial(result)) {
                     //是否存在核保退回
                     if (checkBack(result)) {
+                        //  add  by  hxl  添加自动更新状态
+                        insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
                         insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
                         insAreaCompanyService.updateById(insAreaCompany);
                     } else
@@ -734,6 +743,8 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                             ODR1011Request odr1011Request = new ODR1011Request(insAreaCompany.getInsOrderNo(), daJiaConfigureParameters, policyInfosDTOS);
                             ODR1011Response payNo = daJiaRequestApiComponents.getPayNo(odr1011Request);
                             if (payNo.getStatus().equals(Message.M0000.getCode())) {
+                                //  add  by  hxl  添加自动更新状态
+                                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
                                 //获取支付二维码成功  保存支付二维码
                                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
                                 insAreaCompany.setPaymentLink(payNo.getResult().getSignInfoUrl());
@@ -769,6 +780,8 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                         LocalDateTime parse = LocalDateTime.parse(collect.get(i).getIssueTm(), formatter);
                         insAreaCompany.setPayDate(parse);
                     }
+                    //  add  by  hxl  添加自动更新状态
+                    insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
                     //更新订单状态
                     insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                     insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
@@ -950,6 +963,8 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                     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);

+ 19 - 1
src/main/java/com/ydtech/modules/order/service/impl/GuorenOrderApiServiceImpl.java

@@ -43,6 +43,7 @@ import com.ydtech.modules.order.entity.vo.guoren.*;
 import com.ydtech.modules.order.service.GuorenOrderApiService;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
+import com.ydtech.modules.order.service.InsSubOrderUpdateDetailService;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
@@ -58,6 +59,7 @@ import org.apache.commons.httpclient.methods.multipart.StringPart;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -115,6 +117,10 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
     private final PtlAgreementAttributionService ptlAgreementAttributionService;
 
+
+    @Autowired
+    private InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
     /**
      * 获取渠道信息
      *
@@ -317,6 +323,8 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         log.debug("----------核保开始,订单号:{}---------", quoteOrderNo);
         //子订单
         InsAreaCompany iac = insAreaCompanyService.getByIdIsExist(quoteOrderNo);
+
+        String oldStatus =iac.getOrderstatus();
         // 获取协议配置信息
         ChannelInfoDto channelInfo = gainChannelConfigInfo(iac.getAgreementId());
 
@@ -368,7 +376,8 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             }
 
         }
-
+        //  add  by  hxl  添加自动更新状态
+        insSubOrderUpdateDetailService.insertData(iac,oldStatus,iac.getOrderstatus(),"1");
         if (iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_AUDIT.getCode())) {
             iac.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
             insAreaCompanyService.updateCompanyAndOrdersMessage(iac, message);
@@ -430,6 +439,9 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
                 boolean jqSyBoo =
                         null != syDataDTO && null != jqDataDTO && syDataDTO.getUnderwriteFlag().equals("1") && jqDataDTO.getUnderwriteFlag().equals("1");
                 if (jqBoo || syBoo || jqSyBoo) {
+
+                    //  add  by  hxl  添加自动更新状态
+                    insSubOrderUpdateDetailService.insertData(iac,iac.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
                     iac.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
                     //更新支付链接
                     SignatureResponse signature = guorenRequestApiComponent.signature(iac);
@@ -455,6 +467,8 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
 
             // 支付
             if (updateFlag) {
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(iac,iac.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
                 iac.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                 guorenRequestApiComponent.queryNoCarPolicyNo(iac);
                 insAreaCompanyService.updateCompanyAndOrders(iac);
@@ -632,6 +646,8 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
         if (type.equals("1")) {
             InsAreaCompany iac = insAreaCompanyService.getByInsOrderNo(orderId);
             if (null != iac) {
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(iac,iac.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
                 iac.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                 InsOrders order = insOrdersService.getById(iac.getOrderno());
                 if (StringUtils.toInt(order.getOrderstatus()) < StringUtils.toInt(iac.getOrderstatus())) {
@@ -1194,6 +1210,8 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
                 if(iac.getPayDate()==null){
                     iac.setPayDate(LocalDateTime.now());
                 }
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(iac,iac.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
                 iac.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                 guorenRequestApiComponent.queryNoCarPolicyNo(iac);
                 insAreaCompanyService.updateCompanyAndOrdersNew(iac);

+ 20 - 0
src/main/java/com/ydtech/modules/order/service/impl/HuaTaiOrderApiServiceImpl.java

@@ -42,6 +42,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -90,6 +91,9 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
     @Value("${api.url}")
     private String apiUrl;
 
+    @Autowired
+    private InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
 
     @Override
     public HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, BaseQuoteVo<AccidentalDrivingVo> zmQuoteVo) {
@@ -264,17 +268,23 @@ 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());
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
                 insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
                 return HttpResult.ok("已转人工核保");
             } else {//当状态为核保不通过时,调整保单状态为报价中
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.QUOTE_ING.getCode(),"1");
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
                 String notion = jqNotion.toString() + syNotion + huaTaiSubmitCommon.getNotion();
                 insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, notion);
                 return HttpResult.error("核保不通过:" + notion);//需要处理放入核保原因
             }
         } else {
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.TO_BACK.getCode(),"1");
             String notion = jqNotion.toString() + syNotion;
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
             insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, notion);
@@ -311,10 +321,14 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         String payUrl = getPaymentUrl(insAreaCompany, huaTaiConfigureParameters);
         if (StringUtils.isNotEmpty(payUrl)) {
             insAreaCompany.setPaymentLink(payUrl);
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.ok("核保成功");
         } else {
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
             insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, "获取支付链接失败");
             return HttpResult.error("获取支付链接失败");
@@ -395,6 +409,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         }
 
         if (jqExistFlag || syExistFlag) {
+            //  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("保单生成成功");
@@ -641,6 +657,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
             //再调用缴费接口获取缴费链接
             return getPayURL(insAreaCompany, huaTaiConfigureParameters);
         } else if ("6".equals(huaTaiSubmitCommon.getTotalUnderWriteInd())) {//当状态为核保不通过时,调整保单状态为报价中
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.QUOTE_ING.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.error("核保不通过:" + huaTaiSubmitCommon.getNotion());//需要处理放入核保原因
@@ -788,6 +806,8 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
             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);
         }

+ 17 - 0
src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -34,6 +34,7 @@ import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -79,6 +80,9 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
     @Value("${api.url}")
     private String apiUrl;
 
+    @Autowired
+    private InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
 
     @Override
     public void isLogin(PtlAgreementAttributionDto attribution, String companyId, String insCompanyName) {
@@ -212,12 +216,16 @@ 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());
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
             String message = crawlerAuditResponse.getMessage();
             insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, message);
             return HttpResult.error(crawlerAuditResponse.getMessage());
         }
+        //  add  by  hxl  添加自动更新状态
+        insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
         // 投保单号
         insAreaCompany.setPaymentLink(crawlerAuditResponse.getPayUrl());
         insAreaCompany.setJqapplyno(crawlerAuditResponse.getJqPolicy());
@@ -248,6 +256,9 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             List<CrawlerVerifyPaymentResponse.DrivingInsurancesDTO> drivingInsurances = crawlerAuditResponse.getDrivingInsurancesDto();
             insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(drivingInsurances)));
 
+            //  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("支付成功");
@@ -482,11 +493,15 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
                 PtlCrawlerApiType.API_8.getDesc(), crawlerBaseRequest, CrawlerAuditResponse.class);
 
         if (crawlerAuditResponse.getCode() == CrawlerAuditStatus.CAS_500.getCode()) {
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.TO_BACK.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
             String message = crawlerAuditResponse.getMessage();
             insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, message);
             return HttpResult.error(crawlerAuditResponse.getMessage());
         } else if (crawlerAuditResponse.getCode() == CrawlerAuditStatus.CAS_200.getCode()) {
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
         } else {
             throw new SystemException(crawlerAuditResponse.getMessage());
@@ -524,6 +539,8 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
             // 3 交叉销售
             List<CrawlerVerifyPaymentResponse.DrivingInsurancesDTO> drivingInsurances = crawlerAuditResponse.getDrivingInsurancesDto();
             insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(drivingInsurances)));
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());//已承保
             insAreaCompanyService.updateCompanyAndOrdersNew(insAreaCompany);
         }

+ 10 - 3
src/main/java/com/ydtech/modules/order/service/impl/InsSubOrderUpdateDetailServiceImpl.java

@@ -48,20 +48,27 @@ public class InsSubOrderUpdateDetailServiceImpl extends ServiceImpl<InsSubOrderU
         //订单状态一致不记录为错误数据
         if(!oldStatus.equals(newStatus)){
             if(InsOrderStatusEnum.WAIT_AUDIT.getCode().equals(oldStatus)){
-                updateType="1";
                 oldRemark=InsOrderStatusEnum.WAIT_AUDIT.getDesc()+"状态";
             }else if(InsOrderStatusEnum.WAIT_PAY.getCode().equals(oldStatus)){
-                updateType="2";
                 oldRemark=InsOrderStatusEnum.WAIT_PAY.getDesc()+"状态";
             }
-            if(InsOrderStatusEnum.WAIT_AUDIT.getCode().equals(newStatus)){
+            if(InsOrderStatusEnum.QUOTE_ING.getCode().equals(newStatus)) {
+                //订单撤回
+                updateType="4";
+                newRemark = InsOrderStatusEnum.QUOTE_ING.getDesc() + "状态";
+            }else if(InsOrderStatusEnum.WAIT_AUDIT.getCode().equals(newStatus)){
                 newRemark=InsOrderStatusEnum.WAIT_AUDIT.getDesc()+"状态";
             }else if(InsOrderStatusEnum.WAIT_PAY.getCode().equals(newStatus)){
+                //订单变为已核保待缴费
+                updateType="1";
                 newRemark=InsOrderStatusEnum.WAIT_PAY.getDesc()+"状态";
             }else if(InsOrderStatusEnum.TO_BACK.getCode().equals(newStatus)){
+                //订单退回
                 updateType="3";
                 newRemark=InsOrderStatusEnum.TO_BACK.getDesc()+"状态";
             }else if(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(newStatus)){
+                //订单变为已承保
+                updateType="2";
                 newRemark=InsOrderStatusEnum.ACCEPT_INSURANCE.getDesc()+"状态";
             }
             if("1".equals(updateMethod)){

+ 11 - 4
src/main/java/com/ydtech/modules/order/service/impl/YongAnOrderServiceImpl.java

@@ -24,16 +24,14 @@ import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
 import com.ydtech.modules.order.entity.vo.ya.YaPayUrlVo;
-import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.order.service.InsTaskImagesService;
-import com.ydtech.modules.order.service.YongAnOrderService;
+import com.ydtech.modules.order.service.*;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.utils.HMAC256Uitil;
 import com.ydtech.utils.HttpXmlUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -89,6 +87,9 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
 
     private final InsImagesUploadCacheComponents insImagesUploadCacheComponents;
 
+    @Autowired
+    private InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
 
 //    @Override
 //    public List<CarModelDTO> vinSearch(String vin) {
@@ -426,6 +427,9 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
                 } else {
                     orderstatus = InsOrderStatusEnum.WAIT_PAY.getCode(); // 5
                 }
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),orderstatus,"1");
+
                 insAreaCompany.setAuditid(orders.getUserid());
                 insAreaCompany.setPaymentLink(payUrl);
                 insAreaCompany.setOrderstatus(orderstatus);
@@ -646,6 +650,9 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             }
             insAreaCompany.setJqpolicyno(StringUtils.isEmpty(cplyNoCI) ? "" : cplyNoCI);
             insAreaCompany.setSypolicyno(StringUtils.isEmpty(cplyNoBI) ? "" : cplyNoBI);
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"2");
+
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());//7 已承保
 //            insAreaCompany.setPaytype(payAppNo);
 //            insAreaCompany.setPaytime(payTime);

+ 18 - 7
src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -67,10 +67,7 @@ import com.ydtech.modules.order.entity.crawler.response.RecognitionResponse;
 import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.vo.*;
-import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.order.service.InsTaskImagesService;
-import com.ydtech.modules.order.service.YongchengOrderApiService;
+import com.ydtech.modules.order.service.*;
 import com.ydtech.modules.order.utils.InsuranceLog;
 import com.ydtech.modules.protocol.entity.constants.PtlApiType;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
@@ -83,6 +80,7 @@ import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -164,6 +162,9 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
     private final InsImagesUploadCacheComponents insImagesUploadCacheComponents;
 
+    @Autowired
+    private InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
     public void gainVehicleModel(YcConfigureParameters ycConfigureParameters, CarInfoVo carInfo, CoreModelsVo coreModelsVo) {
         CarModel_Req carModelReq = new CarModel_Req();
         carModelReq.setFrameNo(carInfo.getFrameNo());
@@ -707,8 +708,12 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                 String statusSy = rd.getStatusSY();
                 if ("0".equals(statusJq) || "0".equals(statusSy)) {
                     iac.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
+                    //  add  by  hxl  添加自动更新状态
+                    insSubOrderUpdateDetailService.insertData(iac,iac.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
                     iac.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
                 } else if ("3".equals(statusJq) || "3".equals(statusSy)) {
+                    //  add  by  hxl  添加自动更新状态
+                    insSubOrderUpdateDetailService.insertData(iac,iac.getOrderstatus(),InsOrderStatusEnum.TO_BACK.getCode(),"1");
                     iac.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
                     StringBuilder sb = new StringBuilder();
                     if (null != rd.getSailResponseMessagedate()) {
@@ -719,6 +724,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                     }
                     iac.setAuditopinion(sb.toString());
                 } else if (statusJq.equals("9") || statusSy.equals("9")) {
+                    //  add  by  hxl  添加自动更新状态
+                    insSubOrderUpdateDetailService.insertData(iac,iac.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
                     iac.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
                 }
 
@@ -845,12 +852,12 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             String cleanStr = yongchengRequestApiComponents.payCallback(o);
             CallBackRequest param = CallBackRequest.buildCallBackParam(cleanStr);
             log.info("永诚API方式 - 补传回调 - 参数:{},车牌号:{}", JSON.toJSONString(param), order.getLicenseno());
-
+            //订单原先状态
+            String oldStatus = iac.getOrderstatus();
             //成功
             if (param.getResult().equals("0")) {
 
                 if (iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_PAY.getCode())) {
-
                     buildCallBackStatus(iac, param.getJqstatus());
                     if (StringUtils.isNotEmpty(param.getBizPolicyNo())) {
                         iac.setSypolicyno(param.getBizPolicyNo());
@@ -885,6 +892,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                 sss.append("变更前子订单状态:" + iac.getOrderstatus());
                 sss.append("变更后订单状态:" + order.getOrderstatus());
                 log.info("-----------订单状态变动----------:" + sss);
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(iac,oldStatus,iac.getOrderstatus(),"1");
                 insAreaCompanyService.updateCompanyAndOrdersMessage(iac, iac.getAuditopinion());
 
             } else {
@@ -1448,7 +1457,7 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
             String cleanStr = yongchengRequestApiComponents.payCallback(o);
             CallBackRequest param = CallBackRequest.buildCallBackParam(cleanStr);
             log.info("永诚API方式 - 补传回调 - 参数:{},车牌号:{}", JSON.toJSONString(param), order.getLicenseno());
-
+            String oldStatus = iac.getOrderstatus();
             //成功
             if (param.getResult().equals("0")) {
                 if (iac.getOrderstatus().equals(InsOrderStatusEnum.WAIT_PAY.getCode())) {
@@ -1462,6 +1471,8 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
                 log.info("变更前订单状态:" + order.getOrderstatus());
                 log.info("变更前子订单状态:" + iac.getOrderstatus());
                 log.info("变更后订单状态:" + order.getOrderstatus());
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(iac,oldStatus,iac.getOrderstatus(),"1");
                 insAreaCompanyService.updateCompanyAndOrdersNew(iac);
             }
         } catch (JsonProcessingException jsonProcessingException) {

+ 23 - 4
src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderApiServiceImpl.java

@@ -37,10 +37,7 @@ import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
-import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.order.service.InsTaskImagesService;
-import com.ydtech.modules.order.service.ZhongMeiOrderApiService;
+import com.ydtech.modules.order.service.*;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementNonCarProductCosts;
 import com.ydtech.modules.protocol.entity.vo.PtlNonCarProductSchemeDetailVo;
@@ -53,6 +50,7 @@ import com.ydtech.utils.baidu.FileUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -108,6 +106,9 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
     @Value("${api.url}")
     private String apiUrl;
 
+    @Autowired
+    private InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
 
     private void modelInquiry(String modelName, List<ModelsQueryResponse.SimpleStadarCarDTO> simpleStadarCarDTOS) {
         if (!simpleStadarCarDTOS.isEmpty()) {
@@ -239,6 +240,8 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
                 zmConfigureParameters);
         // 3. 人工核保
         if (SubmitStatus.S_3.getCode().equals(response.getSubmitStatus())) {
+            //  add  by  hxl  添加手动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_AUDIT.getCode(),"1");
             insAreaCompany.setUnderwritingStatus(UnderwritingStatus.US_2.getCode());
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_AUDIT.getCode());
             String message = response.getSubmitNotion();
@@ -254,6 +257,8 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
             insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(response.getAccidentNos())));
         }
         insAreaCompany.setInsOrderNo(response.getProposalNo());
+        //  add  by  hxl  添加手动更新状态
+        insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
         insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
         return HttpResult.ok("核保成功");
@@ -296,6 +301,8 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
                 if (coverageRequest.getAccidentPolicyNos() != null) {
                     insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(coverageRequest.getAccidentPolicyNos())));
                 }
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"2");
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
                 insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             }
@@ -318,12 +325,16 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
                 if (approvedRequest.getAccidentNos() != null) {
                     insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(approvedRequest.getAccidentNos())));
                 }
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
                 insAreaCompany.setPaymentLink(approvedRequest.getPayUrl());
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             } else {
                 if (StringUtils.isNotEmpty(approvedRequest.getHandleText())) {
                     insAreaCompany.setAuditopinion(approvedRequest.getHandleText());
                 }
+                //  add  by  hxl  添加自动更新状态
+                insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.TO_BACK.getCode(),"1");
                 insAreaCompany.setOrderstatus(InsOrderStatusEnum.TO_BACK.getCode());
             }
             insAreaCompanyService.updateCompanyAndOrdersMessage(insAreaCompany, insAreaCompany.getAuditopinion());
@@ -365,6 +376,8 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
             if (orderStatusResponse.getAccidentPolicyNos() != null) {
                 insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(orderStatusResponse.getAccidentPolicyNos())));
             }
+            //  add  by  hxl  添加手动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
 
@@ -622,10 +635,14 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         // 3. 通过返回核保状态修改状态
         if ("核保通过".equals(underWriteInd) || "自动核保".equals(underWriteInd)) {
             insAreaCompany.setPaymentLink(submitStatusQueryResponse.getPayUrl());
+            //  add  by  hxl  添加手动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());//当核保状态返回核保通过时,调整保单状态为已核保待缴费
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.ok(underWriteInd);
         } else if ("核保不通过".equals(underWriteInd)) {//当状态为核保不通过时,调整保单状态为报价中
+            //  add  by  hxl  添加手动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.QUOTE_ING.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.error("核保不通过:" + submitStatusQueryResponse.getIssuedReason());
@@ -738,6 +755,8 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
             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);

+ 11 - 0
src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderServiceImpl.java

@@ -35,9 +35,11 @@ import com.ydtech.modules.order.entity.vo.zm.ZmAscriptionVo;
 import com.ydtech.modules.order.entity.vo.zm.ZmQuoteSpiderVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
+import com.ydtech.modules.order.service.InsSubOrderUpdateDetailService;
 import com.ydtech.modules.order.service.ZhongMeiOrderService;
 import com.ydtech.utils.CalculateUtils;
 import com.ydtech.utils.idgen.IdGenerate;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -65,6 +67,9 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
 
     private final FeeRuleSchemeService feeRuleSchemeService;
 
+    @Autowired
+    private  InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
 
     public ZhongMeiOrderServiceImpl(InsAreaCompanyService insAreaCompanyService, ZhongmeiRequestComponents zhongmeiRequestComponents, InsOrdersService insOrdersService, InsTaskImageService insTaskImageService, EsmInsAttributionService esmInsAttributionService, SysUserService sysUserService, EsmInsCompanyService esmInsCompanyService, FeeRuleSchemeService feeRuleSchemeService) {
         this.insAreaCompanyService = insAreaCompanyService;
@@ -157,6 +162,8 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
             String epolicyUrlImg = qrCodeImage;
             insAreaCompany.setAuditid(insOrders.getUserid());
             insAreaCompany.setPaymentLink(epolicyUrlImg);
+            //  add  by  hxl  添加手动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode()); // 2
         }
         insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
@@ -182,6 +189,8 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         String epolicyUrlImg = qrCodeImage;
         insAreaCompany.setAuditid(insOrders.getUserid());
         insAreaCompany.setPaymentLink(epolicyUrlImg);
+        //  add  by  hxl  添加手动更新状态
+        insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode()); // 5
         insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
         return HttpResult.ok();
@@ -206,6 +215,8 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         insAreaCompany.setSypolicyno(data.getContractNo2());
 //        insAreaCompany.setJypolicyno(data.getContractNo_CP());
         insAreaCompany.setInsOrderNo(data.getContractMainNo());
+        //  add  by  hxl  添加手动更新状态
+        insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());//已承保
         //  order.setPaytype(payAppNo);
         //  order.setPaytime(payTime);

+ 14 - 5
src/main/java/com/ydtech/modules/order/service/impl/ZijinOrderApiServiceImpl.java

@@ -32,10 +32,7 @@ import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
 import com.ydtech.modules.order.entity.vo.SpecialAuditVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjQuoteAccidentVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsQueryVo;
-import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.order.service.InsTaskImagesService;
-import com.ydtech.modules.order.service.ZijinOrderApiService;
+import com.ydtech.modules.order.service.*;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.utils.CalculateUtils;
@@ -43,6 +40,7 @@ import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.FileUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
@@ -89,6 +87,10 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
     @Value("${api.url}")
     private String apiUrl;
 
+    @Autowired
+    private  InsSubOrderUpdateDetailService insSubOrderUpdateDetailService;
+
+
     @Override
     public HttpResult<List<QueryVehicProductsResponse.ProductDtoListDTO>> queryVehicleProducts(ZjVehicleProductsQueryVo zjVehicleProductsQueryVo) {
         // 1 通过 协议id获取配置实体
@@ -361,7 +363,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
             List<DrivingInsuranceDto> drivingInsuranceDto = queryOrderDetailResponse.getDrivingInsuranceDto();
             insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(drivingInsuranceDto)));
-
+            //  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("订单已支付,订单状态修改完成");
@@ -404,6 +407,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             ResultEnum.verify(paymentCallbacksRequest.getErrorCode(), paymentCallbacksRequest.getErrorMessage());
             String proposalNo = paymentCallbacksRequest.getOrderId();
             InsAreaCompany insAreaCompany = insAreaCompanyService.getByInsOrderNo(proposalNo);
+            //  add  by  hxl  添加自动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"2");
             // 保单号
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
@@ -432,6 +437,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         QueryOrderDetailResponse.ResultObjDTO resultObj = queryOrderDetailResponse.getResultObj();
 
         if (OrderStatusEnum.O_2.getCode().equals(resultObj.getOrderStatus())) {
+            //  add  by  hxl  添加手动更新状态
+            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.WAIT_PAY.getCode(),"1");
             QueryOrderDetailResponse.BaseInfoDTO baseInfo = queryOrderDetailResponse.getResultObj().getBaseInfo();
 
             insAreaCompany.setJqpolicyno(baseInfo.getPolicyNoCI());
@@ -448,6 +455,8 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.ok("核保成功");
         } else 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());
 
             List<QueryOrderDetailResponse.OrderPolicyListDTO> orderPolicyListDTOS = resultObj.getOrderPolicyList()