平安请求参数修改以及封装

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

@@ -52,8 +52,8 @@ public class PingAnOrderApiController {
 
     @PostMapping(value = "/audit")
     @ApiOperation(value = "提交核保")
-    public HttpResult<Object> audit(@RequestSingleParam(value = "companyId") String companyId) throws Exception {
-        return this.pingAnOrderApiService.audit(companyId);
+    public HttpResult<Object> audit(@RequestBody BaseQuoteInfoVo quoteInfo) throws Exception {
+        return this.pingAnOrderApiService.audit(quoteInfo);
     }
 
     @PostMapping("/getPolicyPrint")
@@ -88,20 +88,20 @@ public class PingAnOrderApiController {
 
     @PostMapping("/queryServiceContract")
     @ApiOperation("服务类特约检索")
-    public HttpResult<Object> queryServiceContract(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) throws Exception {
-        return this.pingAnOrderApiService.queryServiceContract(quoteVo,quoteInfo);
+    public HttpResult<Object> queryServiceContract(@RequestSingleParam(value = "companyId") String companyId) throws Exception {
+        return this.pingAnOrderApiService.queryServiceContract(companyId);
     }
 
     @PostMapping("/getDocumentStatusList")
     @ApiOperation("单证状态查询")
-    public HttpResult<Object> getDocumentStatusList(@RequestBody String subOrderNo,BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) throws Exception {
-        return this.pingAnOrderApiService.getDocumentStatusList(subOrderNo,quoteVo,quoteInfo);
+    public HttpResult<Object> getDocumentStatusList(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+        return this.pingAnOrderApiService.getDocumentStatusList(quoteVo);
     }
 
     @PostMapping("/repealDocument")
     @ApiOperation("撤销单证")
-    public HttpResult<Object> repealDocument(@RequestBody String subOrderNo,BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) throws Exception {
-        return this.pingAnOrderApiService.repealDocument(subOrderNo,quoteVo,quoteInfo);
+    public HttpResult<Object> repealDocument(@RequestBody BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) throws Exception {
+        return this.pingAnOrderApiService.repealDocument(quoteVo);
     }
 
     @PostMapping("/getDmvehicleInfo")

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

@@ -2,14 +2,9 @@ package com.ydtech.modules.order.entity.api.pingan.request;
 
 import com.ydtech.modules.order.entity.api.pingan.utils.checkNull.FieldEmptyException;
 import com.ydtech.modules.order.entity.api.pingan.utils.checkNull.Validate;
-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 lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
  *  @version
  *  @author: hxl
@@ -42,11 +37,11 @@ public class RepealDocumentRequest extends PingAnBaseRequest{
      */
     private String departmentCode;
 
-    public RepealDocumentRequest(String subOrderNo, BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo, String documentType) {
-        this.setUserId(quoteInfo.getUserId());
+    public RepealDocumentRequest(String subOrderNo, String uerId,String departmentCode,String documentType) {
+        this.setUserId(uerId);
         this.setDocumentType(documentType);
         this.setDocumentNo(subOrderNo);
-        this.setDepartmentCode(quoteVo.getCompanyId());
+        this.setDepartmentCode(departmentCode);
     }
 
     @Validate

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

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.pingan.request;
 
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
-import com.ydtech.modules.order.entity.api.pingan.response.SearchPAVehicleListResponse;
 import com.ydtech.modules.order.entity.api.pingan.utils.NetworkUtils;
 import com.ydtech.modules.order.entity.api.pingan.utils.checkNull.CheckNotEmpty;
 import com.ydtech.modules.order.entity.api.pingan.utils.checkNull.FieldEmptyException;
@@ -331,10 +330,11 @@ public class SubmitApplyRequest extends PingAnBaseRequest {
      */
     private List<DocListDTO> docList;
     //todo
-    public SubmitApplyRequest(PingAnConfigureParameters parameters, BaseQuoteInfoVo quoteInfo, SearchPAVehicleListResponse.ModelsDto modelsDto, String flowid) {
+    public SubmitApplyRequest(PingAnConfigureParameters parameters, BaseQuoteInfoVo quoteInfo, String flowid,String isApply) {
 
         this.setUserId(parameters.getUserId());
         this.setFlowid(flowid);
+        this.setIsApply(isApply);
         Map<String, String> map = NetworkUtils.printNetworkInfo();
         this.setIp(map.get("ip"));
         this.setMacAddress(map.get("mac"));

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

@@ -46,10 +46,10 @@ public interface PingAnOrderApiService {
 
     /**
      * 提交核保
-     * @param companyId 子订单号
+     * @param quoteInfo 子订单号
      * @return
      */
-    HttpResult<Object> audit(String companyId)  throws Exception;
+    HttpResult<Object> audit(BaseQuoteInfoVo quoteInfo)  throws Exception;
 
     /**
      * 电子保单
@@ -118,7 +118,7 @@ public interface PingAnOrderApiService {
     * @Exception
     *
     */
-    HttpResult<Object> queryServiceContract(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
+    HttpResult<Object> queryServiceContract(String companyId);
 
 
     /**
@@ -130,7 +130,7 @@ public interface PingAnOrderApiService {
      * @Exception
      *
      */
-    HttpResult<Object> getDocumentStatusList(String subOrderNo,BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo);
+    HttpResult<Object> getDocumentStatusList(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
 
 
     /**
@@ -142,5 +142,5 @@ public interface PingAnOrderApiService {
      * @Exception
      *
      */
-    HttpResult<Object> repealDocument(String subOrderNo,BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo);
+    HttpResult<Object> repealDocument(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo);
 }

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

@@ -22,7 +22,6 @@ import com.ydtech.modules.order.entity.api.pingan.response.*;
 import com.ydtech.modules.order.entity.api.pingan.utils.PDFUtil;
 import com.ydtech.modules.order.entity.api.pingan.utils.PinAnEnumUtils;
 import com.ydtech.modules.order.entity.api.pingan.utils.UUIDUtils;
-import com.ydtech.modules.order.entity.config.BoHaiConfigureParameters;
 import com.ydtech.modules.order.entity.config.PingAnConfigureParameters;
 import com.ydtech.modules.order.entity.crawler.vo.CrawlerPolicyPrintVo;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
@@ -374,19 +373,17 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> audit(String subOrderNo) {
-        InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
+    public HttpResult<Object> audit(BaseQuoteInfoVo quoteInfo) {
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(quoteInfo.getOrderNo());
         // 账号信息
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
         // 通过 协议id获取配置实体
         PingAnConfigureParameters parameters = configureParametersComponents.toEntity(PingAnConfigureParameters.class,
                 ptlAgreementAttribution);
-        BaseQuoteInfoVo quoteInfo=new BaseQuoteInfoVo();
         //此处的流程id必须传入   获取报价流程的返回的流程id
-        String flowid="";
-        SearchPAVehicleListResponse.ModelsDto modelsDto =new SearchPAVehicleListResponse.ModelsDto();
+        String flowid=insAreaCompany.getInsOrderNo();
         //调用6.1 补充信息并核保
-        SubmitApplyRequest submitApplyRequest = new SubmitApplyRequest(parameters, quoteInfo, modelsDto,flowid);
+        SubmitApplyRequest submitApplyRequest = new SubmitApplyRequest(parameters, quoteInfo,flowid,"true");
         SubmitApplyResponse submitApplyResponse=null;
         try{
             submitApplyResponse= pinganRequestApiComponents.submitApply(submitApplyRequest);
@@ -561,12 +558,6 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     @Override
     public void getOrderDetailNew(String subOrderNo) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
-        // 账号信息
-        PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(insAreaCompany.getAgreementId());
-        // 通过 协议id获取配置实体
-        BoHaiConfigureParameters parameters = configureParametersComponents.toEntity(BoHaiConfigureParameters.class,
-                ptlAgreementAttribution);
-
         //调用承保接口
         String applyno = !StringUtils.isEmpty(insAreaCompany.getJqapplyno()) ? insAreaCompany.getJqapplyno() :
                 insAreaCompany.getSyapplyno();
@@ -616,7 +607,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             IndexResponse indexResponse = pinganRequestApiComponents.index(indexRequest);
             if(indexResponse!=null && IndexResposeCodeEnum.INDEX_CODE_MSG_0.getCode().equals(indexResponse.getResultCode())){
                 //调用 交管车辆验证码   4.3  传入标的接口返回的流程id
-                DmvehicleInfoRequst dmvehicleInfoRequst = new DmvehicleInfoRequst(parameters,indexResponse.getFlowid(),"frameNo","engineNo",null);
+                DmvehicleInfoRequst dmvehicleInfoRequst = new DmvehicleInfoRequst(parameters,indexResponse.getFlowid(),quoteInfo.getCarInfo().getFrameNo(),quoteInfo.getCarInfo().getEngineNo(),null);
                 DmvehicleInfoResponse dmvehicleInfoResponse=null;
                 try{
                     dmvehicleInfoResponse= pinganRequestApiComponents.getDmvehicleInfo(dmvehicleInfoRequst);
@@ -658,8 +649,9 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             IndexRequest indexRequest = new IndexRequest(parameters, quoteInfo.getCarInfo());
             IndexResponse indexResponse = pinganRequestApiComponents.index(indexRequest);
             if(indexResponse!=null && IndexResposeCodeEnum.INDEX_CODE_MSG_0.getCode().equals(indexResponse.getResultCode())){
-                //调用 续保确认   4.1 传入标的接口返回的流程id
-                RenewalConfirmRequest renewalConfirmRequest = new RenewalConfirmRequest(parameters,indexResponse.getFlowid(),"checkNo");
+                //调用 续保确认   4.1 传入标的接口返回的流程id     车主身份证号后6为
+                String identifyNumber = quoteInfo.getOwnerInfo().getIdentifyNumber();
+                RenewalConfirmRequest renewalConfirmRequest = new RenewalConfirmRequest(parameters,indexResponse.getFlowid(),identifyNumber.substring(identifyNumber.length() - 6));
                 RenewalConfirmResponse renewalConfirmResponse=null;
                 try{
                     renewalConfirmResponse= pinganRequestApiComponents.renewalConfirm(renewalConfirmRequest);
@@ -688,10 +680,10 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> queryServiceContract(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) {
+    public HttpResult<Object> queryServiceContract(String companyId) {
         try{
             //调用
-            ServiceContractRequest serviceContractRequest = new ServiceContractRequest(quoteVo.getCompanyId());
+            ServiceContractRequest serviceContractRequest = new ServiceContractRequest(companyId);
             ServiceContractResponse serviceContractResponse=null;
             try{
                 serviceContractResponse= pinganRequestApiComponents.queryServiceContract(serviceContractRequest);
@@ -716,7 +708,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> getDocumentStatusList(String subOrderNo,BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo,BaseQuoteInfoVo quoteInfo) {
+    public HttpResult<Object> getDocumentStatusList(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
 
         try{
             //调用
@@ -727,7 +719,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             // 通过 协议id获取配置实体
             PingAnConfigureParameters parameters = configureParametersComponents.toEntity(PingAnConfigureParameters.class,
                     ptlAgreementAttribution);
-            DocumentStatusListRequest   documentStatusListRequest=new DocumentStatusListRequest(subOrderNo,parameters);
+            DocumentStatusListRequest   documentStatusListRequest=new DocumentStatusListRequest(quoteVo.getOrderNo(),parameters);
             DocumentStatusListResponse documentStatusListResponse=null;
             try{
                 documentStatusListResponse= pinganRequestApiComponents.getDocumentStatusList(documentStatusListRequest);
@@ -753,7 +745,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
     *
     */
     @Override
-    public HttpResult<Object> repealDocument(String subOrderNo,BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo, BaseQuoteInfoVo quoteInfo) {
+    public HttpResult<Object> repealDocument(BaseQuoteVo<List<BoHaiQuoteAccidentVo>> quoteVo) {
         try{
             //调用
             // 协议id获取配置实体
@@ -763,7 +755,7 @@ public class PingAnOrderApiServiceImpl implements PingAnOrderApiService {
             // 通过 协议id获取配置实体
             PingAnConfigureParameters parameters = configureParametersComponents.toEntity(PingAnConfigureParameters.class,
                     ptlAgreementAttribution);
-            RepealDocumentRequest   repealDocumentRequest=new RepealDocumentRequest(subOrderNo,quoteVo,quoteInfo,"2");
+            RepealDocumentRequest   repealDocumentRequest=new RepealDocumentRequest(quoteVo.getOrderNo(),parameters.getUserId(),parameters.getCityCode(),"2");
             RepealDocumentResponse repealDocumentResponse=null;
             try{
                 repealDocumentResponse= pinganRequestApiComponents.repealDocument(repealDocumentRequest);