فهرست منبع

阳光订单状态查询

Qchen 1 سال پیش
والد
کامیت
e7af081ecc
17فایلهای تغییر یافته به همراه197 افزوده شده و 45 حذف شده
  1. 4 4
      tenant/insurance/quotation-bohai/src/main/java/com/jzg/quote/bohai/api/service/impl/BoHaiApiRequestImpl.java
  2. 6 1
      tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/OrderStatusVo.java
  3. 1 1
      tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/service/QuotationBaseService.java
  4. 3 3
      tenant/insurance/quotation-guoren/src/main/java/com/jzg/quote/guoren/api/service/Impl/GuoRenApiRequestImpl.java
  5. 1 1
      tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequest.java
  6. 4 4
      tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/api/service/Impl/HuaTaiApiRequestImpl.java
  7. 3 1
      tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java
  8. 1 1
      tenant/insurance/quotation-taiping/src/main/java/com/jzg/quotation/taiping/crawler/service/impl/TaipingCrawlerRequestImpl.java
  9. 7 7
      tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/componet/YangGuangApiRequestComponent.java
  10. 66 0
      tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangGetEpolicyPdfUrlRequest.java
  11. 9 8
      tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangUpLoadRequest.java
  12. 17 0
      tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/response/YangGuangGetEpolicyPdfUrlResponse.java
  13. 12 0
      tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/response/YangGuangUploadResponse.java
  14. 60 11
      tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java
  15. 1 1
      tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/service/impl/YongChengApiRequestImpl.java
  16. 1 1
      tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/api/service/impl/ZhongMeiApiRequestImpl.java
  17. 1 1
      tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/service/Impl/ZiJinApiRequestImpl.java

+ 4 - 4
tenant/insurance/quotation-bohai/src/main/java/com/jzg/quote/bohai/api/service/impl/BoHaiApiRequestImpl.java

@@ -187,13 +187,13 @@ public class BoHaiApiRequestImpl implements BoHaiApiRequest {
 
 
     /**
     /**
      * 后续需补充如何获取投保单号
      * 后续需补充如何获取投保单号
-     * @param orderBase
+     * @param orderStatusVo
      */
      */
     @Override
     @Override
-    public void queryOrderState(OrderBase orderBase) {
+    public void queryOrderState(OrderStatusVo orderStatusVo) {
         //获取配置信息
         //获取配置信息
-        BoHaiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(BoHaiConfigureParameters.class, orderBase.getAttributionInformationVo().getConfigInfo());
-        BoHaiApiOrder apiOrder = boHaiApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
+        BoHaiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(BoHaiConfigureParameters.class, orderStatusVo.getOrder().getAttributionInformationVo().getConfigInfo());
+        BoHaiApiOrder apiOrder = boHaiApiOrderService.findByOrdersNo(orderStatusVo.getOrder().getOrdersNo());
         StatusDocumentsRequest statusDocumentsRequest = new StatusDocumentsRequest(parameters, apiOrder.getOrderNo(),  apiOrder.getProposalNo());
         StatusDocumentsRequest statusDocumentsRequest = new StatusDocumentsRequest(parameters, apiOrder.getOrderNo(),  apiOrder.getProposalNo());
         StatusDocumentsResponse statusDocumentsResponse;
         StatusDocumentsResponse statusDocumentsResponse;
         try {
         try {

+ 6 - 1
tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/OrderStatusVo.java

@@ -24,5 +24,10 @@ public class OrderStatusVo {
     /**
     /**
      * 订单信息
      * 订单信息
      */
      */
-    private InsOrders insorders;
+    private InsOrders insOrders;
+
+    /**
+     * 订单号信息
+     */
+    private InsOrdersPolicy insOrdersPolicy;
 }
 }

+ 1 - 1
tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/service/QuotationBaseService.java

@@ -41,6 +41,6 @@ public interface QuotationBaseService {
     /**
     /**
      * 查询订单状态
      * 查询订单状态
      */
      */
-    void queryOrderState(OrderStatusVo orderStatusVo);
+    void queryOrderState(OrderStatusVo orderStatusVo) throws JsonProcessingException;
 
 
 }
 }

+ 3 - 3
tenant/insurance/quotation-guoren/src/main/java/com/jzg/quote/guoren/api/service/Impl/GuoRenApiRequestImpl.java

@@ -231,10 +231,10 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
      * @param orderBase
      * @param orderBase
      */
      */
     @Override
     @Override
-    public void queryOrderState(OrderBase orderBase) {
+    public void queryOrderState(OrderStatusVo orderBase) {
         //配置信息
         //配置信息
-        GuoRenConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(GuoRenConfigureParameters.class, orderBase.getAttributionInformationVo().getConfigInfo());
-        GuoRenApiOrder guoRenApiOrder = guoRenApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
+        GuoRenConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(GuoRenConfigureParameters.class, orderBase.getOrder().getAttributionInformationVo().getConfigInfo());
+        GuoRenApiOrder guoRenApiOrder = guoRenApiOrderService.findByOrdersNo(orderBase.getOrder().getOrdersNo());
 
 
         OrderStateRequest orderStateRequest = new OrderStateRequest();
         OrderStateRequest orderStateRequest = new OrderStateRequest();
         orderStateRequest.addProposalNos(guoRenApiOrder.getJqApplyNo());
         orderStateRequest.addProposalNos(guoRenApiOrder.getJqApplyNo());

+ 1 - 1
tenant/insurance/quotation-huanong/src/main/java/com/jzg/quote/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequest.java

@@ -2026,7 +2026,7 @@ public class HuaNongCrawlerQuotedPriceRequest implements Serializable, HuaNongHe
             private String individualBusinessFlag;
             private String individualBusinessFlag;
 
 
             public CustomerDTO(CustomerInfoVo customerInfoVo, String role, String tandBRelationship) {
             public CustomerDTO(CustomerInfoVo customerInfoVo, String role, String tandBRelationship) {
-                this.age = customerInfoVo.getAge();
+                this.age = customerInfoVo.getAge().toString();
                 this.annualSalary = "";
                 this.annualSalary = "";
                 this.birthday = customerInfoVo.getBirthday();
                 this.birthday = customerInfoVo.getBirthday();
                 this.cervalidDate = customerInfoVo.getIdentifyValidDate();
                 this.cervalidDate = customerInfoVo.getIdentifyValidDate();

+ 4 - 4
tenant/insurance/quotation-huatai/src/main/java/com/jzg/quote/huatai/api/service/Impl/HuaTaiApiRequestImpl.java

@@ -282,16 +282,16 @@ public class HuaTaiApiRequestImpl implements HuaTaiApiRequest {
     /**
     /**
      * 查询订单状态
      * 查询订单状态
      *
      *
-     * @param orderBase
+     * @param orderStatusVo
      */
      */
     @Override
     @Override
-    public void queryOrderState(OrderBase orderBase) {
-        AttributionInformationVo attributionInformationVo = orderBase.getAttributionInformationVo();
+    public void queryOrderState(OrderStatusVo orderStatusVo) {
+        AttributionInformationVo attributionInformationVo = orderStatusVo.getOrder().getAttributionInformationVo();
         //配置信息
         //配置信息
         HuaTaiConfigureParameters huaTaiParameters = ConfigureParametersConversion.conversionEntity(HuaTaiConfigureParameters.class, attributionInformationVo.getConfigInfo());
         HuaTaiConfigureParameters huaTaiParameters = ConfigureParametersConversion.conversionEntity(HuaTaiConfigureParameters.class, attributionInformationVo.getConfigInfo());
         HuaTaiBaseRequestHead baseRequestHead = new HuaTaiBaseRequestHead(huaTaiParameters);
         HuaTaiBaseRequestHead baseRequestHead = new HuaTaiBaseRequestHead(huaTaiParameters);
 
 
-        HuaTaiApiOrder huaTaiApiOrder = huaTaiApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
+        HuaTaiApiOrder huaTaiApiOrder = huaTaiApiOrderService.findByOrdersNo(orderStatusVo.getOrder().getOrdersNo());
         //获取核保状态
         //获取核保状态
         HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse = submitStatus(huaTaiApiOrder, huaTaiParameters, "2");
         HuaTaiSubmitStatusQueryResponse submitStatusQueryResponse = submitStatus(huaTaiApiOrder, huaTaiParameters, "2");
 
 

+ 3 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -289,7 +289,7 @@ public class UnifyOrderManager {
 
 
     @Operation(summary = "获取订单状态")
     @Operation(summary = "获取订单状态")
     @PostMapping("/getOrderStatus")
     @PostMapping("/getOrderStatus")
-    public HttpResult getOrderStatus(@RequestBody OrderStatusVo orderStatusVo) {
+    public HttpResult getOrderStatus(@RequestBody OrderStatusVo orderStatusVo) throws JsonProcessingException {
 
 
         //获取保司实体
         //获取保司实体
         QuotationApiBaseService orderStatusService = companyFactory.getOrderStatusService(
         QuotationApiBaseService orderStatusService = companyFactory.getOrderStatusService(
@@ -298,6 +298,8 @@ public class UnifyOrderManager {
                 baseController);
                 baseController);
         InsOrders insOrders = insOrdersService.getById(orderStatusVo.getOrder().getOrdersNo());
         InsOrders insOrders = insOrdersService.getById(orderStatusVo.getOrder().getOrdersNo());
         AssertionUtils.isFail(Objects.isNull(insOrders),"订单不存在");
         AssertionUtils.isFail(Objects.isNull(insOrders),"订单不存在");
+        InsOrdersPolicy insOrdersPolicy = insOrdersPolicyService.getById(insOrders.getId());
+        orderStatusVo.setInsOrdersPolicy(insOrdersPolicy);
         orderStatusService.queryOrderState(orderStatusVo);
         orderStatusService.queryOrderState(orderStatusVo);
         return HttpResult.ok("状态刷新成功");
         return HttpResult.ok("状态刷新成功");
     }
     }

+ 1 - 1
tenant/insurance/quotation-taiping/src/main/java/com/jzg/quotation/taiping/crawler/service/impl/TaipingCrawlerRequestImpl.java

@@ -116,7 +116,7 @@ public class TaipingCrawlerRequestImpl implements TaipingCrawlerRequest {
     }
     }
 
 
     @Override
     @Override
-    public void queryOrderState(OrderBase orderBase) {
+    public void queryOrderState(OrderStatusVo orderStatusVo) {
         HttpHeaders httpHeaders = taiPingCrawlerRequestComponent.getHeaders();
         HttpHeaders httpHeaders = taiPingCrawlerRequestComponent.getHeaders();
         TaiPingCrawlerQueryListData.RecordsDTO recordsDTO = taiPingCrawlerRequestComponent.queryList(new TaiPingCrawlerQueryListRequest(), httpHeaders);
         TaiPingCrawlerQueryListData.RecordsDTO recordsDTO = taiPingCrawlerRequestComponent.queryList(new TaiPingCrawlerQueryListRequest(), httpHeaders);
 
 

+ 7 - 7
tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/componet/YangGuangApiRequestComponent.java

@@ -140,13 +140,13 @@ public class YangGuangApiRequestComponent {
         return post(yangGuangSubmitRequest, YangGuangSubmitResponse.class);
         return post(yangGuangSubmitRequest, YangGuangSubmitResponse.class);
     }
     }
 
 
-//    /**
-//     *  投保单状态查询
-//     */
-//    public YangGuangProposalStatusQueryResponse proposalStatusQuery(YangGuangProposalStatusQueryRequest yangGuangProposalStatusQueryRequest) throws JsonProcessingException {
-//        return post(yangGuangProposalStatusQueryRequest, YangGuangProposalStatusQueryResponse.class);
-//    }
-//
+    /**
+     *  投保单状态查询
+     */
+    public YangGuangProposalStatusQueryResponse proposalStatusQuery(YangGuangProposalStatusQueryRequest yangGuangProposalStatusQueryRequest) throws JsonProcessingException {
+        return post(yangGuangProposalStatusQueryRequest, YangGuangProposalStatusQueryResponse.class);
+    }
+
     /**
     /**
      * 线上支付
      * 线上支付
      */
      */

+ 66 - 0
tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangGetEpolicyPdfUrlRequest.java

@@ -0,0 +1,66 @@
+package com.jzg.quotation.yangguang.api.entity.request;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.jzg.quotation.yangguang.api.entity.YangGuangConfigureParameters;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class YangGuangGetEpolicyPdfUrlRequest extends YangGuangBaseRequest {
+    /**
+     * 请求时间
+     */
+    @JSONField(name = "RequestDate")
+    private String RequestDate;
+
+    /**
+     * 请求编码
+     */
+    @JSONField(name = "RequestNo")
+    private String RequestNo;
+
+    /**
+     * 出单机构
+     */
+    @JSONField(name = "ComCode")
+    private String ComCode;
+    /**
+     * 归属业务员
+     */
+    @JSONField(name = "HandlerCode")
+    private String HandlerCode;
+    /**
+     *  服务区域代码(车商代码)
+     */
+    @JSONField(name = "ServiceArea")
+    private String ServiceArea;
+
+    /**
+     *  代理机构,出单机构存在多代理时需传入
+     */
+    @JSONField(name = "AgentCode")
+    private String AgentCode;
+    /**
+     * 保单号
+     */
+    @JSONField(name = "PolicyNo")
+    private String PolicyNo;
+
+    public YangGuangGetEpolicyPdfUrlRequest(YangGuangConfigureParameters ygConfigureParameters, String busNo) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        this.RequestNo = "getEpolicyPDFURL";
+        this.ComCode = ygConfigureParameters.getComCode();
+        this.RequestDate = LocalDateTime.now().format(formatter);
+        this.AgentCode = ygConfigureParameters.getAgentCode();
+        this.ServiceArea = ygConfigureParameters.getServiceArea() == null ? "" : ygConfigureParameters.getServiceArea();
+        this.HandlerCode = ygConfigureParameters.getHandlerCode();
+        this.PolicyNo = busNo;
+    }
+
+}

+ 9 - 8
tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangUpLoadRequest.java

@@ -1,6 +1,7 @@
 package com.jzg.quotation.yangguang.api.entity.request;
 package com.jzg.quotation.yangguang.api.entity.request;
 
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.annotation.JSONField;
+import com.jzg.commons.util.MinioUtils;
 import com.jzg.quotation.commons.constant.enums.base.InsuranceImageEnum;
 import com.jzg.quotation.commons.constant.enums.base.InsuranceImageEnum;
 import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
 import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
 import com.jzg.quotation.yangguang.api.entity.YangGuangConfigureParameters;
 import com.jzg.quotation.yangguang.api.entity.YangGuangConfigureParameters;
@@ -28,9 +29,9 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
     @JSONField(name = "Body")
     @JSONField(name = "Body")
     private Body Body;
     private Body Body;
 
 
-    public YangGuangUpLoadRequest(YangGuangApiOrder yangGuangApiOrder, InsuranceImageVo insuranceImageVo, YangGuangConfigureParameters parameters, String apiUrl) {
+    public YangGuangUpLoadRequest(YangGuangApiOrder yangGuangApiOrder, InsuranceImageVo.ImageDTO imageDTO, YangGuangConfigureParameters parameters, InsuranceImageVo insuranceImage) {
         this.Head = new Head();
         this.Head = new Head();
-        this.Body = new Body(yangGuangApiOrder,insuranceImageVo, parameters,apiUrl);
+        this.Body = new Body(yangGuangApiOrder,imageDTO, parameters,insuranceImage);
     }
     }
 
 
     @Data
     @Data
@@ -56,8 +57,8 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
         @JSONField(name = "imageInfo")
         @JSONField(name = "imageInfo")
         private imageInfo imageInfo;
         private imageInfo imageInfo;
 
 
-        public Body(YangGuangApiOrder yangGuangApiOrder,InsuranceImageVo insuranceImageVo, YangGuangConfigureParameters parameters,String apiUrl) {
-            this.imageInfo = new imageInfo(yangGuangApiOrder, insuranceImageVo, parameters,apiUrl);
+        public Body(YangGuangApiOrder yangGuangApiOrder,InsuranceImageVo.ImageDTO imageDTO, YangGuangConfigureParameters parameters,InsuranceImageVo insuranceImageVo) {
+            this.imageInfo = new imageInfo(yangGuangApiOrder, imageDTO, parameters,insuranceImageVo);
         }
         }
         @Data
         @Data
         public static class imageInfo implements Serializable {
         public static class imageInfo implements Serializable {
@@ -88,13 +89,13 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
             @JSONField(name = "insuranceImageList")
             @JSONField(name = "insuranceImageList")
             private List<insuranceImageList> insuranceImageList;
             private List<insuranceImageList> insuranceImageList;
 
 
-            public imageInfo(YangGuangApiOrder yangGuangApiOrder,InsuranceImageVo insuranceImageVo, YangGuangConfigureParameters parameters,String apiUrl) {
+            public imageInfo(YangGuangApiOrder yangGuangApiOrder,InsuranceImageVo.ImageDTO imageDTO, YangGuangConfigureParameters parameters, InsuranceImageVo insuranceImageVo) {
                 this.caseNo = yangGuangApiOrder.getOrdersNo();
                 this.caseNo = yangGuangApiOrder.getOrdersNo();
                 this.appCode = "CARAPPLY";
                 this.appCode = "CARAPPLY";
                 this.caseSource = "0";
                 this.caseSource = "0";
                 this.fileServer = "0";
                 this.fileServer = "0";
                 this.ifNationwideQuick = "0";
                 this.ifNationwideQuick = "0";
-                this.insuranceImageList = Arrays.asList(new insuranceImageList(insuranceImageVo,parameters,apiUrl));
+                this.insuranceImageList = Arrays.asList(new insuranceImageList(imageDTO,parameters,insuranceImageVo));
             }
             }
 
 
             @NoArgsConstructor
             @NoArgsConstructor
@@ -139,8 +140,8 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
                 @JSONField(name = "exifInfo")
                 @JSONField(name = "exifInfo")
                 private String exifInfo;
                 private String exifInfo;
 
 
-                public insuranceImageList(InsuranceImageVo insuranceImageVo, YangGuangConfigureParameters parameters, String apiUrl) {
-//                    this.imageUrl = apiUrl + insuranceImageVo.getUrl();
+                public insuranceImageList(InsuranceImageVo.ImageDTO imageDTO, YangGuangConfigureParameters parameters,InsuranceImageVo insuranceImageVo) {
+                    this.imageUrl = MinioUtils.getPresignedObjectUrl("jzg", imageDTO.getImageName());
                     this.imageType = "01";
                     this.imageType = "01";
                     this.referer = "SXJZG";
                     this.referer = "SXJZG";
                     this.userNo = parameters.getHandlerCode();
                     this.userNo = parameters.getHandlerCode();

+ 17 - 0
tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/response/YangGuangGetEpolicyPdfUrlResponse.java

@@ -0,0 +1,17 @@
+package com.jzg.quotation.yangguang.api.entity.response;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class YangGuangGetEpolicyPdfUrlResponse extends YangGuangBaseResponse {
+    /**
+     *  电子保单PDF地址
+     */
+    @JSONField(name = "EPolicyPDFURL")
+    private String EPolicyPDFURL;
+}

+ 12 - 0
tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/response/YangGuangUploadResponse.java

@@ -0,0 +1,12 @@
+package com.jzg.quotation.yangguang.api.entity.response;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class YangGuangUploadResponse {
+    private String retFlag;
+
+    private String retMsg;
+}

+ 60 - 11
tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
+import com.jzg.commons.entity.orders.po.InsOrders;
+import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.entity.vo.aggregated.*;
 import com.jzg.quotation.commons.entity.vo.aggregated.*;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
@@ -18,11 +20,8 @@ import com.jzg.quotation.yangguang.api.componet.YangGuangApiRequestComponent;
 import com.jzg.quotation.yangguang.api.entity.YangGuangConfigureParameters;
 import com.jzg.quotation.yangguang.api.entity.YangGuangConfigureParameters;
 import com.jzg.quotation.yangguang.api.entity.po.YangGuangApiOrder;
 import com.jzg.quotation.yangguang.api.entity.po.YangGuangApiOrder;
 import com.jzg.quotation.yangguang.api.entity.request.*;
 import com.jzg.quotation.yangguang.api.entity.request.*;
-import com.jzg.quotation.yangguang.api.entity.response.YangGuangAccuracyCalculateResponse;
-import com.jzg.quotation.yangguang.api.entity.response.YangGuangQueryVehicleModelResponse;
-import com.jzg.quotation.yangguang.api.entity.response.YangGuangSubmitResponse;
+import com.jzg.quotation.yangguang.api.entity.response.*;
 import com.jzg.quotation.yangguang.api.properties.YangGuangApiProperties;
 import com.jzg.quotation.yangguang.api.properties.YangGuangApiProperties;
-import com.jzg.quotation.yangguang.api.entity.response.YangGuangPaymentResponse;
 import com.jzg.quotation.yangguang.api.service.YangGuangApiRequest;
 import com.jzg.quotation.yangguang.api.service.YangGuangApiRequest;
 import com.jzg.quotation.yangguang.api.service.YangGuangCrawlerOrderService;
 import com.jzg.quotation.yangguang.api.service.YangGuangCrawlerOrderService;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -217,11 +216,12 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
                     .getConfigInfo());
                     .getConfigInfo());
             List<InsuranceImageVo> imageVoList = insuranceUploadImageVo.getImageVoList();
             List<InsuranceImageVo> imageVoList = insuranceUploadImageVo.getImageVoList();
             for (InsuranceImageVo imageVo : imageVoList) {
             for (InsuranceImageVo imageVo : imageVoList) {
-                ObjectMapper objectMapper = new ObjectMapper();
-                YangGuangUpLoadRequest yangGuangUpLoadRequest = new YangGuangUpLoadRequest(yangGuangApiOrder, imageVo, parameters,apiUrl);
-                String json = objectMapper.writeValueAsString(yangGuangUpLoadRequest);
-                String yangGuangUpLoadResponse = yangGuangApiRequestComponent.upload(json);
-
+                for (InsuranceImageVo.ImageDTO imageDTO : imageVo.getImageBase64List()) {
+                    ObjectMapper objectMapper = new ObjectMapper();
+                    YangGuangUpLoadRequest yangGuangUpLoadRequest = new YangGuangUpLoadRequest(yangGuangApiOrder, imageDTO, parameters,imageVo);
+                    String json = objectMapper.writeValueAsString(yangGuangUpLoadRequest);
+                    String yangGuangUpLoadResponse = yangGuangApiRequestComponent.upload(json);
+                }
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             throw new RuntimeException(e);
             throw new RuntimeException(e);
@@ -231,11 +231,60 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
     @Override
     @Override
     public void downloadPolicy(OrderBase orderBase) {
     public void downloadPolicy(OrderBase orderBase) {
 
 
+
     }
     }
 
 
     @Override
     @Override
-    public void queryOrderState(OrderStatusVo orderStatusVo) {
-
+    public void queryOrderState(OrderStatusVo orderStatusVo) throws JsonProcessingException {
+        OrderBase orderBase = orderStatusVo.getOrder();
+        InsOrders insOrders = orderStatusVo.getInsOrders();
+        InsOrdersPolicy insOrdersPolicy = orderStatusVo.getInsOrdersPolicy();
+        // 账号配置信息
+        YangGuangConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(YangGuangConfigureParameters.class, orderBase
+                .getAttributionInformationVo()
+                .getConfigInfo());
+        YangGuangProposalStatusQueryRequest yangGuangProposalStatusQueryRequest = new YangGuangProposalStatusQueryRequest(orderStatusVo.getInsOrdersPolicy(), parameters);
+        YangGuangProposalStatusQueryResponse yangGuangProposalStatusQueryResponse = yangGuangApiRequestComponent.proposalStatusQuery(yangGuangProposalStatusQueryRequest);
+        if (yangGuangProposalStatusQueryResponse.getErrorCode().equals("0")) {
+            String statusSy = yangGuangProposalStatusQueryResponse.getBiUnderWriteFlag();
+            String statusJq = yangGuangProposalStatusQueryResponse.getCiUnderWriteFlag();
+            if ("3".equals(statusJq) || "3".equals(statusSy)) {
+                //人工核保
+                insOrders.setOrderStatus(InsOrderStatusEnum.STAFF_PROCESS.getCode());
+                //underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.STAFF_PROCESS);
+                //underwritingResultsVo.setUnderwritingResult("人工处理");
+            } else if ("2".equals(statusJq) || "2".equals(statusSy)) {
+                // 核保失败
+                insOrders.setOrderStatus(InsOrderStatusEnum.AUDIT_FAIL.getCode());
+                // underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
+                StringBuilder sb = new StringBuilder();
+                if (null != yangGuangProposalStatusQueryResponse.getCiUnderWriteMsg()) {
+                    sb.append(String.format("交强险提示信息:s%", yangGuangProposalStatusQueryResponse.getBiUnderWriteMsg()));
+                }
+                if (null != yangGuangProposalStatusQueryResponse.getBiUnderWriteMsg()) {
+                    sb.append(String.format("商业险提示信息:s%", yangGuangProposalStatusQueryResponse.getBiUnderWriteMsg()));
+                }
+                // underwritingResultsVo.setUnderwritingResult(sb.toString());
+            } else if ("1".equals(statusJq) || "1".equals(statusSy)) {
+                // 自动核保成功
+                // underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
+                String jq = yangGuangProposalStatusQueryResponse.getCiProposalNo(); // 交强险投保单号
+                String sy = yangGuangProposalStatusQueryResponse.getBiProposalNo(); // 商业险投保单号
+                insOrdersPolicy.setJqApplyNo(jq);
+                insOrdersPolicy.setSyApplyNo(sy);
+                // 获取缴费地址
+                PaymentLinkVo paymentLinkVo = new PaymentLinkVo();
+                paymentLinkVo.setOrder(orderStatusVo.getOrder());
+                getPaymentLink(paymentLinkVo);
+            }
+            String jqPolicyNo = yangGuangProposalStatusQueryResponse.getCiPolicyNo();
+            String syPolicyNo = yangGuangProposalStatusQueryResponse.getBiPolicyNo();
+            if (jqPolicyNo != null || syPolicyNo != null) {
+                insOrders.setOrderStatus(InsOrderStatusEnum.UNDERWRITED.getCode());
+                insOrdersPolicy.setJqPolicyNo(jqPolicyNo);
+                insOrdersPolicy.setSyPolicyNo(syPolicyNo);
+            }
+        }
     }
     }
 
 
 }
 }

+ 1 - 1
tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/service/impl/YongChengApiRequestImpl.java

@@ -292,7 +292,7 @@ public class YongChengApiRequestImpl implements YongChengApiRequest {
         YcApiConfigurationProperties configurationProperties = ConfigureParametersConversion.conversionEntity(YcApiConfigurationProperties.class, orderStatusVo.getOrder().getAttributionInformationVo().getConfigInfo());
         YcApiConfigurationProperties configurationProperties = ConfigureParametersConversion.conversionEntity(YcApiConfigurationProperties.class, orderStatusVo.getOrder().getAttributionInformationVo().getConfigInfo());
         //0 支付回调 1核保回调 5直接返回字符串信息
         //0 支付回调 1核保回调 5直接返回字符串信息
         String type = "5";
         String type = "5";
-        CallbackRequest callbackRequest = CallbackRequest.buildCallbackAnOrderParam(orderStatusVo.getInsorders().getCompanyOrderNo(), configurationProperties.gainAuthorityDataXml(), type);
+        CallbackRequest callbackRequest = CallbackRequest.buildCallbackAnOrderParam(orderStatusVo.getInsOrders().getCompanyOrderNo(), configurationProperties.gainAuthorityDataXml(), type);
         try{
         try{
             String cleanStr = ycRequestApiComponents.payCallback(callbackRequest);
             String cleanStr = ycRequestApiComponents.payCallback(callbackRequest);
             CallBackResponse response = CallBackResponse.buildCallBackParam(cleanStr);
             CallBackResponse response = CallBackResponse.buildCallBackParam(cleanStr);

+ 1 - 1
tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/api/service/impl/ZhongMeiApiRequestImpl.java

@@ -169,7 +169,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
 
 
 
 
     @Override
     @Override
-    public void queryOrderState(OrderBase orderBase) {
+    public void queryOrderState(OrderStatusVo orderStatusVo) {
     }
     }
 
 
 }
 }

+ 1 - 1
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/service/Impl/ZiJinApiRequestImpl.java

@@ -143,7 +143,7 @@ public class ZiJinApiRequestImpl implements ZiJinApiRequest {
     }
     }
 
 
     @Override
     @Override
-    public void queryOrderState(OrderBase orderBase) {
+    public void queryOrderState(OrderStatusVo orderStatusVo) {
 
 
     }
     }
 }
 }