紫金财险驾意险修改

src/main/java/com/ydtech/modules/order/components/RenewalComponents.java

@@ -27,7 +27,7 @@ public class RenewalComponents {
      * @return QuoteRespVo
      */
     public YaQuoteInfoVo renewal(InsRenewal insRenewal, RenewalRequest renewalRequest) {
-        return insCrawlerOrderComponents.request(insRenewal.getUrl(), insRenewal.getNamesimple(), "续保", renewalRequest, YaQuoteInfoVo.class);
+        return insCrawlerOrderComponents.request(insRenewal.getUrl(), insRenewal.getCompanyId(), "续保", renewalRequest, YaQuoteInfoVo.class);
     }
 
 }

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

@@ -10,12 +10,12 @@ import com.ydtech.modules.order.entity.api.zj.request.CalculatePremiumRequest;
 import com.ydtech.modules.order.entity.api.zj.request.PaymentCallbacksRequest;
 import com.ydtech.modules.order.entity.api.zj.request.SubmitVerifyRequest;
 import com.ydtech.modules.order.entity.api.zj.response.QueryClauseDataResponse;
+import com.ydtech.modules.order.entity.api.zj.response.QueryVehicProductsResponse;
 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.entity.vo.SpecialAuditVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsQueryVo;
-import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsVo;
 import com.ydtech.modules.order.service.ZijinOrderApiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,8 +42,8 @@ public class ZijinOrderApiController {
 
     @PostMapping("/queryVehicleProducts")
     @ApiOperation(value = "查询“车+意”中意外险方案信息")
-    public HttpResult<List<ZjVehicleProductsVo>> queryVehicleProducts(@RequestBody ZjVehicleProductsQueryVo zjVehicleProductsQueryVo) {
-        return this.zijinOrderApiService.queryVehicleProducts(zjVehicleProductsQueryVo);
+    public HttpResult<List<QueryVehicProductsResponse.ProductDtoListDTO>> queryVehicleProducts(@RequestBody ZjVehicleProductsQueryVo zjVehicleProductsVo) {
+        return this.zijinOrderApiService.queryVehicleProducts(zjVehicleProductsVo);
     }
 
     @QuoteVerification("报价授权")

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

@@ -253,7 +253,6 @@ public class InsAreaCompany implements Serializable {
         this.riskinfo = JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList()));
         this.kindinfo = JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList()));
         this.orderstatus = InsOrderStatus.S_0.getCode();
-        this.companyId = quoteRespVo.getCompanyId();
     }
 
 }

src/main/java/com/ydtech/modules/order/entity/vo/zj/ZjVehicleProductsVo.java

@@ -1,41 +0,0 @@
-package com.ydtech.modules.order.entity.vo.zj;
-
-
-import com.ydtech.modules.order.entity.api.zj.constants.enums.EHealthTypeCodeEnum;
-import com.ydtech.modules.order.entity.api.zj.response.QueryVehicProductsResponse;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-@Data
-public class ZjVehicleProductsVo {
-
-    @ApiModelProperty("险种名称")
-    private String riskCode;
-
-    @ApiModelProperty("险种名称")
-    private String riskName;
-
-    @ApiModelProperty("车险附加险种信息")
-    private List<QueryVehicProductsResponse.ProductDtoListDTO> productDtoListDTOS;
-
-    public ZjVehicleProductsVo(String riskCode, String riskName, List<QueryVehicProductsResponse.ProductDtoListDTO> productDtoListDTOS) {
-        this.riskCode = riskCode;
-        this.riskName = riskName;
-        this.productDtoListDTOS = productDtoListDTOS;
-    }
-
-    public static List<ZjVehicleProductsVo> toZjVehicleProductsVoList(List<QueryVehicProductsResponse.ProductDtoListDTO> productDtoList) {
-        EHealthTypeCodeEnum[] values = EHealthTypeCodeEnum.values();
-        return Arrays.stream(values).map(x -> {
-            List<QueryVehicProductsResponse.ProductDtoListDTO> collect = productDtoList.stream().filter(e -> x.getCode().equals(e.getRiskCode())).collect(Collectors.toList());
-            return new ZjVehicleProductsVo(x.getCode(), x.getName(), collect);
-        }).filter(x -> !x.getProductDtoListDTOS().isEmpty()).collect(Collectors.toList());
-    }
-
-
-}

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

@@ -6,16 +6,16 @@ import com.ydtech.modules.order.entity.api.zj.request.CalculatePremiumRequest;
 import com.ydtech.modules.order.entity.api.zj.request.PaymentCallbacksRequest;
 import com.ydtech.modules.order.entity.api.zj.request.SubmitVerifyRequest;
 import com.ydtech.modules.order.entity.api.zj.response.QueryClauseDataResponse;
+import com.ydtech.modules.order.entity.api.zj.response.QueryVehicProductsResponse;
 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.entity.vo.SpecialAuditVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsQueryVo;
-import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsVo;
 
 import java.util.List;
 
-public interface ZijinOrderApiService{
+public interface ZijinOrderApiService {
 
     /**
      * 报价
@@ -32,6 +32,7 @@ public interface ZijinOrderApiService{
      * @return HttpResult
      */
     HttpResult<Object> submitImage(String subOrderNo);
+
     /**
      * 特约查询
      *
@@ -52,7 +53,7 @@ public interface ZijinOrderApiService{
      *
      * @return 查询“车+意”中意外险方案信息
      */
-    HttpResult<List<ZjVehicleProductsVo>> queryVehicleProducts(ZjVehicleProductsQueryVo zjVehicleProductsVo);
+    HttpResult<List<QueryVehicProductsResponse.ProductDtoListDTO>> queryVehicleProducts(ZjVehicleProductsQueryVo zjVehicleProductsVo);
 
     /**
      * 订单状态查询

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

@@ -116,7 +116,6 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
 
         if (insTaskImages.isEmpty()) {
             throw new SystemException("没有上传成功的影像");
-
         }
         InsZmUploadImageVo insZmUploadImageVo = new InsZmUploadImageVo(insAreaCompany.getInsOrderNo(), esmInsAttribution.getUsername(), insTaskImages);
         zhongmeiRequestComponents.submitImage(insZmUploadImageVo, new ParameterizedTypeReference<Response<Object>>() {

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

@@ -28,7 +28,6 @@ import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
 import com.ydtech.modules.order.entity.vo.SpecialAuditVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsQueryVo;
-import com.ydtech.modules.order.entity.vo.zj.ZjVehicleProductsVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsTaskImagesService;
@@ -40,7 +39,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -75,14 +73,14 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
 
 
     @Override
-    public HttpResult<List<ZjVehicleProductsVo>> queryVehicleProducts(ZjVehicleProductsQueryVo zjVehicleProductsQueryVo) {
+    public HttpResult<List<QueryVehicProductsResponse.ProductDtoListDTO>> queryVehicleProducts(ZjVehicleProductsQueryVo zjVehicleProductsQueryVo) {
         // 1 通过 协议id获取配置实体
         ZjConfigureParameters zjConfigureParameters = configureParametersComponents.toEntity(ZjConfigureParameters.class, zjVehicleProductsQueryVo.getAgreementId());
         HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(zjVehicleProductsQueryVo.getAgreementId());
         // 2. 请求驾意险
         QueryVehicProductsRequest queryVehicProductsRequest = new QueryVehicProductsRequest(zjVehicleProductsQueryVo.getSeatCount(), zjConfigureParameters.getAppKey(), zjConfigureParameters.getProposalCityCode());
         QueryVehicProductsResponse queryVehicProductsResponse = zijinRequestApiComponents.queryVehicleProducts(queryVehicProductsRequest, httpHeaders);
-        return HttpResult.ok(ZjVehicleProductsVo.toZjVehicleProductsVoList(queryVehicProductsResponse.getProductDtoList()));
+        return HttpResult.ok(queryVehicProductsResponse.getProductDtoList());
     }
 
 
@@ -152,7 +150,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
     }
 
     @Override
-    public HttpResult<Object> audit(SpecialAuditVo<SubmitVerifyRequest.EngageListDTO> specialAudit ) {
+    public HttpResult<Object> audit(SpecialAuditVo<SubmitVerifyRequest.EngageListDTO> specialAudit) {
 
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(specialAudit.getCompanyId());
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());