Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/ins/model/pingan/respose/PingAnQuoteRespVo.java

@@ -0,0 +1,16 @@
+package com.ydtech.modules.ins.model.pingan.respose;
+
+
+import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.entity.api.pingan.response.QuoteResponse;
+import lombok.Data;
+
+@Data
+public class PingAnQuoteRespVo extends QuoteRespVo {
+
+    // 财意险保费
+    QuoteResponse.AhsUpcActualPremiumDTO ahsUpcActualPremium =new QuoteResponse.AhsUpcActualPremiumDTO();
+    // 小微险保费
+    QuoteResponse.XwActualPremiumDTO xwActualPremium = new QuoteResponse.XwActualPremiumDTO();
+
+}

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

@@ -5,6 +5,7 @@ import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.config.properties.BohaiApiConfigurationProperties;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.api.bohai.BoHaiEncrypted;
@@ -72,6 +73,7 @@ public class BoHaiOrderApiController {
         return this.boHaiOrderApiService.submitImage(companyId);
     }
 
+    @AuditVerification("核保")
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
     public HttpResult<Object> audit(@RequestSingleParam(value = "companyId") String companyId) throws Exception {

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

@@ -47,7 +47,7 @@ public class DaJiaOrderController {
 //        return HttpResult.ok("ok");
     }
 
-//    @AuditVerification("核保")
+    @AuditVerification("核保")
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
     public HttpResult<Object> audit(@RequestSingleParam(value = "companyId") String companyId) {

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

@@ -5,6 +5,7 @@ import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.guoren.CarModelResp;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.entity.api.guoren.constants.GoodsClassifyList;
 import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
@@ -76,6 +77,7 @@ public class GuoRenOrderApiController {
         return guorenOrderApiService.pay(companyId);
     }
 
+    @AuditVerification("核保")
     @ApiOperation(value = "核保")
     @PostMapping("/audit")
     public HttpResult auditApi(@RequestSingleParam(value = "companyId") String companyId) {

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

@@ -4,6 +4,7 @@ package com.ydtech.modules.order.controller;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.components.huatai.HuiTaiUploadImageComponents;
@@ -54,6 +55,7 @@ public class HuaTaiOrderApiController {
         return this.huaTaiOrderApiService.queryClauseData(companyId);
     }
 
+    @AuditVerification("核保")
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")//3.6.	转投保接口
     public HttpResult<Object> audit(@RequestBody SpecialAuditVo<InsHuataiContributingVo> specialAudit) {

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

@@ -5,6 +5,7 @@ import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
@@ -44,6 +45,7 @@ public class InsCrawlerOrderController extends BaseController {
         return insuranceCrawlerOrderService.submitImage(subOrderNo);
     }
 
+    @AuditVerification("核保")
     @PostMapping("/audit")
     @ApiOperation("核保")
     public HttpResult<Object> audit(@RequestSingleParam(value = "subOrderNo") String subOrderNo) {

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

@@ -4,13 +4,16 @@ package com.ydtech.modules.order.controller;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
+import com.ydtech.modules.order.entity.api.pingan.response.UnAutoProductDetailResponse;
 import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.bohai.BoHaiQuoteAccidentVo;
+import com.ydtech.modules.order.entity.vo.bohai.ProductDetailsQueryVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductQueryVo;
+import com.ydtech.modules.order.entity.vo.pingan.PingAnQuoteVo;
 import com.ydtech.modules.order.service.PingAnOrderApiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,7 +42,7 @@ public class PingAnOrderApiController {
     @QuoteVerification("报价授权")
     @PostMapping("/quote")
     @ApiOperation("报价")
-    public HttpResult<QuoteRespVo> quote(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+    public HttpResult<QuoteRespVo> quote(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
         BaseQuoteInfoVo quoteInfo = this.insOrdersComponents.getQuoteInfo(quoteVo.getOrderNo(), quoteVo.getAgreementId());
         return this.pingAnOrderApiService.quote(quoteInfo, quoteVo);
     }
@@ -50,6 +53,7 @@ public class PingAnOrderApiController {
         return this.pingAnOrderApiService.submitImage(companyId);
     }
 
+    @AuditVerification("核保")
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
     public HttpResult<Object> audit(@RequestBody BaseQuoteInfoVo quoteInfo) throws Exception {
@@ -82,7 +86,7 @@ public class PingAnOrderApiController {
 
     @PostMapping("/renewalConfirm")
     @ApiOperation("续保")
-    public HttpResult<Object> renewalConfirm(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) throws Exception {
+    public HttpResult<Object> renewalConfirm(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) throws Exception {
         return this.pingAnOrderApiService.renewalConfirm(quoteVo,quoteInfo);
     }
 
@@ -94,19 +98,25 @@ public class PingAnOrderApiController {
 
     @PostMapping("/getDocumentStatusList")
     @ApiOperation("单证状态查询")
-    public HttpResult<Object> getDocumentStatusList(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+    public HttpResult<Object> getDocumentStatusList(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
         return this.pingAnOrderApiService.getDocumentStatusList(quoteVo);
     }
 
     @PostMapping("/repealDocument")
     @ApiOperation("撤销单证")
-    public HttpResult<Object> repealDocument(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+    public HttpResult<Object> repealDocument(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
         return this.pingAnOrderApiService.repealDocument(quoteVo);
     }
 
     @PostMapping("/getDmvehicleInfo")
     @ApiOperation("获取交管车辆验证码")
-    public HttpResult<Object> getDmvehicleInfo(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) throws Exception {
+    public HttpResult<Object> getDmvehicleInfo(@RequestBody PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) throws Exception {
         return this.pingAnOrderApiService.getDmvehicleInfo(quoteVo,quoteInfo);
     }
+
+    @PostMapping("/productDetailsQuery")
+    @ApiOperation("获取财意险险种套餐责任信息")
+    public HttpResult<List<UnAutoProductDetailResponse.UnAutoProductDetailsDTO>> productDetailsQuery(@RequestBody ProductDetailsQueryVo productDetailsQueryVo) throws Exception {
+        return this.pingAnOrderApiService.productDetailsQuery(productDetailsQueryVo);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.ydtech.modules.order.controller;
 
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
@@ -41,6 +42,7 @@ public class YongAnOrderApiController {
         return this.yongAnOrderService.quote(quoteInfo, quoteVo);
     }
 
+    @AuditVerification("核保")
     @PostMapping("/audit")
     @ApiOperation("核保")
     public HttpResult audit(@RequestSingleParam(value = "companyId") String companyId) {

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

@@ -7,6 +7,7 @@ import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.esm.model.EsmInsAttachInsure;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
@@ -50,6 +51,7 @@ public class YongChengOrderApiController {
         return yongchengOrderApiService.quoteApi(quoteVo);
     }
 
+    @AuditVerification("核保")
     @ApiOperation(value = "永诚API方式 - 核保")
     @PostMapping("/audit")
     public HttpResult auditApi(@RequestSingleParam(value = "companyId") String companyId) {
@@ -60,6 +62,7 @@ public class YongChengOrderApiController {
     @PostMapping(value = "/uploadImage")
     public HttpResult uploadImageApi(@RequestSingleParam(value = "companyId") String companyId) {
         return yongchengOrderApiService.uploadImageApi(companyId);
+//        return HttpResult.ok("ok");
     }
 
     @ApiOperation(value = "永诚API方式 -电子保单")

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

@@ -8,6 +8,7 @@ import com.ydtech.modules.ins.model.vo.GeneralNonCarProductReqVo;
 import com.ydtech.modules.ins.model.vo.GeneralNonCarProductResVo;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.api.zhongmei.request.ApprovedRequest;
@@ -63,6 +64,7 @@ public class ZhongMeiOrderApiController {
         return this.zhongMeiOrderApiService.quote(quoteInfo, zmQuoteVo);
     }
 
+    @AuditVerification("核保")
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
     public HttpResult<Object> audit(@RequestSingleParam(value = "companyId") String companyId) {

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

@@ -3,6 +3,7 @@ package com.ydtech.modules.order.controller;
 
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
@@ -46,6 +47,7 @@ public class ZhongMeiOrderController {
         return this.zhongMeiOrderService.submitImage(companyId);
     }
 
+    @AuditVerification("核保")
     @PostMapping("/audit")
     @ApiOperation("核保")
     public HttpResult audit(@RequestSingleParam(value = "companyId") String companyId) {

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

@@ -4,6 +4,7 @@ package com.ydtech.modules.order.controller;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.aop.AuditVerification;
 import com.ydtech.modules.order.aop.QuoteVerification;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.api.zijin.request.PaymentCallbacksRequest;
@@ -66,6 +67,7 @@ public class ZijinOrderApiController {
         return this.zijinOrderApiService.queryClauseData(companyId);
     }
 
+    @AuditVerification("核保")
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
     public HttpResult<Object> audit(@RequestBody SpecialAuditVo<SubmitVerifyRequest.EngageListDTO> specialAudit) {

src/main/java/com/ydtech/modules/order/entity/api/pingan/request/QuoteRequest.java

@@ -779,6 +779,12 @@ public class QuoteRequest extends PingAnBaseRequest {
          */
         private String loanVehicleFlag;
 
+        public BizQuoteDTO() {
+        }
+
+        public BizQuoteDTO(String beginDate) {
+            this.beginDate = beginDate;
+        }
     }
     /***
      * 交强险信息

src/main/java/com/ydtech/modules/order/entity/vo/pingan/PingAnQuoteVo.java

@@ -0,0 +1,56 @@
+package com.ydtech.modules.order.entity.vo.pingan;
+
+import com.ydtech.modules.order.entity.api.pingan.request.QuoteRequest;
+import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "平安报价实体")
+public class PingAnQuoteVo<T> extends BaseQuoteVo<T> {
+
+    @ApiModelProperty("是否通融报价")
+    //add by hxl  2024-04-03
+    private String accommodationFlag;
+
+    @ApiModelProperty("是否投保财意险")
+    //add by hxl  2024-04-03
+    private String applyUnAuto;
+
+    @ApiModelProperty("是否投保小微险")
+    //add by hxl  2024-04-03
+    private String applyXiaoWei;
+    /***
+     * 财意险列表
+     */
+    @ApiModelProperty("财意险列表")
+    //add by hxl  2024-04-03
+    private List<QuoteRequest.UnAutoListInfoDTO> unAutoListInfo=new ArrayList<QuoteRequest.UnAutoListInfoDTO>();
+    /***
+     * 小微险列表
+     */
+    @ApiModelProperty("小微险列表")
+    //add by hxl  2024-04-03
+    private List<QuoteRequest.UnAutoListInfoDTO> xiaoWeiListInfo=new ArrayList<QuoteRequest.UnAutoListInfoDTO>();
+
+    /***
+     *  投保附加自用充电桩损失保险
+     * 【自用充电桩设备信息列表，最多3个桩】
+     */
+    @ApiModelProperty("投保附加自用充电桩损失保险")
+    //add by hxl  2024-04-03
+    private List<QuoteRequest.Amount22XNYChargingPostListDTO> amount22XNYChargingPostList=new ArrayList<QuoteRequest.Amount22XNYChargingPostListDTO>();
+
+    /***
+     *  投保附加自用充电桩损失保险
+     * 【自用充电桩设备信息列表，最多3个桩】
+     */
+    @ApiModelProperty("投保附加自用充电桩损失保险")
+    //add by hxl  2024-04-03
+    private List<QuoteRequest.Amount23XNYChargingPostListDTO> amount23XNYChargingPostList=new ArrayList<QuoteRequest.Amount23XNYChargingPostListDTO>();
+
+}

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

@@ -5,10 +5,10 @@ import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.order.entity.api.pingan.response.UnAutoProductDetailResponse;
 import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.bohai.BoHaiQuoteAccidentVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductDetailsQueryVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductQueryVo;
+import com.ydtech.modules.order.entity.vo.pingan.PingAnQuoteVo;
 
 import java.util.List;
 import java.util.Map;
@@ -35,7 +35,7 @@ public interface PingAnOrderApiService {
      * @param quoteVo
      * @return
      */
-    HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception;
+    HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception;
 
     /**
      * 提交影像
@@ -94,7 +94,7 @@ public interface PingAnOrderApiService {
     * @Exception   
     * 
     */
-    HttpResult<Object> getDmvehicleInfo(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
+    HttpResult<Object> getDmvehicleInfo(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
 
 
     /**
@@ -106,7 +106,7 @@ public interface PingAnOrderApiService {
      * @Exception
      *
      */
-    HttpResult<Object> renewalConfirm(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
+    HttpResult<Object> renewalConfirm(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
 
 
     /**
@@ -130,7 +130,7 @@ public interface PingAnOrderApiService {
      * @Exception
      *
      */
-    HttpResult<Object> getDocumentStatusList(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
+    HttpResult<Object> getDocumentStatusList(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
 
 
     /**
@@ -142,5 +142,5 @@ public interface PingAnOrderApiService {
      * @Exception
      *
      */
-    HttpResult<Object> repealDocument(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
+    HttpResult<Object> repealDocument(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
 }

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

@@ -5,6 +5,7 @@ import com.ydtech.config.properties.PingAnApiConfigurationProperties;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.ins.model.pingan.respose.PingAnQuoteRespVo;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.pingan.PinganRequestApiComponents;
@@ -27,10 +28,13 @@ import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
+import com.ydtech.modules.order.entity.vo.InsOrdersEditingVo;
 import com.ydtech.modules.order.entity.vo.bohai.BoHaiQuoteAccidentVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductDetailsQueryVo;
 import com.ydtech.modules.order.entity.vo.bohai.ProductQueryVo;
+import com.ydtech.modules.order.entity.vo.pingan.PingAnQuoteVo;
 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.PingAnOrderApiService;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
@@ -65,6 +69,8 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
 
     private final InsTaskImagesService insTaskImagesService;
 
+    private final InsOrdersService  insOrdersService;
+
 
     private final PingAnApiConfigurationProperties properties;
     /**
@@ -142,7 +148,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
      *
      */
     @Override
-    public HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+    public HttpResult<QuoteRespVo> quote(BaseQuoteInfoVo quoteInfo, PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
         // 协议id获取配置实体
         String agreementId = quoteVo.getAgreementId();
         // 账号信息
@@ -172,7 +178,10 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
              CarConfirmResponse carConfirmResponse = pinganRequestApiComponents.carConfirm(carConfirmRequest);
 
              //4.报价  使用车辆确认返回的流程id
-             QuoteRequest quoteRequest = new QuoteRequest(parameters, quoteInfo,  modelsDto, carConfirmResponse.getFlowid(),"applyBiz",new QuoteRequest.BizQuoteDTO(),"applyForce","accommodationFlag", "applyUnAuto","applyXiaoWei",new ArrayList<QuoteRequest.UnAutoListInfoDTO>(),new ArrayList<QuoteRequest.UnAutoListInfoDTO>(),new ArrayList<QuoteRequest.Amount22XNYChargingPostListDTO>(), new ArrayList<QuoteRequest.Amount23XNYChargingPostListDTO>());
+             CarConfirmResponse.BizQuoteDTO bizQuote = carConfirmResponse.getBizQuote();
+             QuoteRequest.BizQuoteDTO bizQuoteDTO = new QuoteRequest.BizQuoteDTO(bizQuote.getBeginDate());
+
+             QuoteRequest quoteRequest = new QuoteRequest(parameters, quoteInfo,  modelsDto, carConfirmResponse.getFlowid(),carConfirmResponse.getIsBizElectronicPolicy(),bizQuoteDTO,carConfirmResponse.getIsForceElectronicPolicy(),quoteVo.getAccommodationFlag(), quoteVo.getApplyUnAuto(),quoteVo.getApplyXiaoWei(),quoteVo.getUnAutoListInfo(),quoteVo.getXiaoWeiListInfo(),quoteVo.getAmount22XNYChargingPostList(), quoteVo.getAmount23XNYChargingPostList());
              QuoteResponse quoteResponse=null;
              try{
                  quoteResponse= pinganRequestApiComponents.quote(quoteRequest);
@@ -194,7 +203,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
                                                   PtlAgreementAttribution ptlAgreementAttribution,
                                                   SearchPAVehicleListResponse.ModelsDto modelsDto) {
 
-        QuoteRespVo quoteRespVo = new QuoteRespVo();
+        PingAnQuoteRespVo quoteRespVo = new PingAnQuoteRespVo();
         // 交强险保费信息
         QuoteResponse.ForceQuoteResultDTO forceQuoteResult = response.getForceQuoteResult();
         //交强险保费
@@ -258,6 +267,9 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
         // 小微险保费
         QuoteResponse.XwActualPremiumDTO xwActualPremium = response.getXwActualPremium();
          //小微险保费
+        quoteRespVo.setAhsUpcActualPremium(ahsUpcActualPremium);
+
+        quoteRespVo.setXwActualPremium(xwActualPremium);
 
         List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
         // 非车险
@@ -279,13 +291,15 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
         quoteRespVo.setSyPremium(syPremium);
         quoteRespVo.setTaxAmount(sumPayTax);
         quoteRespVo.setJyPremium(jyPremium);
-        quoteRespVo.setCiSumPermium(CalculateUtils.add(jqPremium, sumPayTax));//交强险和车船税合计
-        quoteRespVo.setSumPermium(CalculateUtils.add(jqPremium, syPremium, sumPayTax, jyPremium));//保费合计
+        //交强险和车船税合计
+        quoteRespVo.setCiSumPermium(CalculateUtils.add(jqPremium, sumPayTax));
+        //保费合计
+        quoteRespVo.setSumPermium(CalculateUtils.add(jqPremium, syPremium, sumPayTax, jyPremium));
         quoteRespVo.setTotalAdjustRate(0);
-        quoteRespVo.setOrderno(yaQuoteInfoVo.getOrderNo()); //订单号
+        //订单号
+        quoteRespVo.setOrderno(yaQuoteInfoVo.getOrderNo());
         quoteRespVo.setCoreModels(modelsDto.toCoreModelsVo());
-        String orderId="";
-        //订单id？？？、
+        String orderId=yaQuoteInfoVo.getOrderNo();
         return responseOrder(response, quoteRespVo, ptlAgreementAttribution,orderId);
     }
 
@@ -413,8 +427,14 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
         PingAnConfigureParameters parameters = configureParametersComponents.toEntity(PingAnConfigureParameters.class,
                 ptlAgreementAttribution);
         BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo=new BaseQuoteVo<>();
+
+        //通过订单号查询车辆信息和车主信息
+        InsOrdersEditingVo insOrders = insOrdersService.revise(subOrderNo);
+        //车主信息
+        CustomerInfoVo ownerInfo = insOrders.getOwnerinfo().toJavaObject(CustomerInfoVo.class);
+        CarInfoVo carInfoVo = insOrders.getCarinfo().toJavaObject(CarInfoVo.class);
         //调用  电子保单pdf  001
-        PolicyPdfRequest policyPdfRequest = new PolicyPdfRequest(parameters,quoteVo,"checkNo","licenseNo","frameNo");
+        PolicyPdfRequest policyPdfRequest = new PolicyPdfRequest(parameters,quoteVo,ownerInfo.getIdentifyNumber(),carInfoVo.getLicenseNo(),carInfoVo.getFrameNo());
         PolicyPdfResponse policyPdfResponse=null;
         try{
             policyPdfResponse= pinganRequestApiComponents.getPolicyPdf(policyPdfRequest);
@@ -593,7 +613,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> getDmvehicleInfo(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) {
+    public HttpResult<Object> getDmvehicleInfo(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) {
         // 协议id获取配置实体
         String agreementId = quoteVo.getAgreementId();
         // 账号信息
@@ -636,7 +656,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> renewalConfirm(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) {
+    public HttpResult<Object> renewalConfirm(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) {
         // 协议id获取配置实体
         String agreementId = quoteVo.getAgreementId();
         // 账号信息
@@ -708,7 +728,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> getDocumentStatusList(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
+    public HttpResult<Object> getDocumentStatusList(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
 
         try{
             //调用
@@ -745,7 +765,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> repealDocument(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
+    public HttpResult<Object> repealDocument(PingAnQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
         try{
             //调用
             // 协议id获取配置实体