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

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiSubmitRequest.java

@@ -127,10 +127,19 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest  {
         private List engage;
 
         public List<ContractDto> getContract(List<RiskInfoVo> riskInfoVos,InsAreaCompany insAreaCompany, HuaTaiConfigureParameters huaTaiConfigureParameters) {
+            String querySequenceNos[] = insAreaCompany.getInsOrderNo().split("-");
+            String jqQuerySequenceNo = querySequenceNos[0].trim();
+            String syQuerySequenceNo = querySequenceNos[1].trim();
             List<ContractDto> contractDTOS = new ArrayList<>();
             for (RiskInfoVo riskInfoVo : riskInfoVos) {
                 ContractDto contractDto = new ContractDto();
                 this.contractMain = new ContractMainDto(riskInfoVo,insAreaCompany,huaTaiConfigureParameters);
+                if (InsuranceRisk.TRAFFIC.getCode().equals(riskInfoVo.getRiskCode())) {
+                    this.platFormMessage = new PlatFormMessage(jqQuerySequenceNo,huaTaiConfigureParameters);
+                }
+                if (InsuranceRisk.BUSINESS.getCode().equals(riskInfoVo.getRiskCode())) {
+                    this.platFormMessage = new PlatFormMessage(syQuerySequenceNo,huaTaiConfigureParameters);
+                }
                 contractDto.setContractMain(contractMain);
                 contractDTOS.add(contractDto);
             }
@@ -200,6 +209,10 @@ public class HuaTaiSubmitRequest extends HuaTaiBaseRequest  {
         // 业务主信息
         @JSONField(name="querySequenceNo")
         private String querySequenceNo;
+
+        public PlatFormMessage(String querySequenceNo, HuaTaiConfigureParameters huaTaiConfigureParameters){
+            this.querySequenceNo = querySequenceNo;
+        }
     }
 
     @AllArgsConstructor

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

@@ -152,7 +152,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
      */
     @Override
     public HttpResult<Object> audit(String companyId) {
-        InsAreaCompany insAreaCompany = insAreaCompanyService.getByInsOrderNo(companyId);
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
         // 1. 协议id获取配置实体
         HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class, insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
@@ -267,7 +267,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
      */
     @Override
     public HttpResult<Object> paymentEnquiry(String companyId) {
-        InsAreaCompany insAreaCompany = insAreaCompanyService.getByInsOrderNo(companyId);
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getById(companyId);
 
         // 1. 协议id获取配置实体
         HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class, insAreaCompany.getAgreementId());
@@ -320,7 +320,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
      */
     @Override
     public HttpResult<List<String>> getPolicyPrint(PolicyPrintVo policyPrintVo) {
-        InsAreaCompany insAreaCompany = insAreaCompanyService.getByInsOrderNo(policyPrintVo.getCompanyId());
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getById(policyPrintVo.getCompanyId());
         // 1. 协议id获取配置实体
         HuaTaiConfigureParameters huaTaiConfigureParameters = configureParametersComponents.toEntity(HuaTaiConfigureParameters.class, insAreaCompany.getAgreementId());
         InsOrders order = insOrdersService.getById(insAreaCompany.getOrderno());
@@ -474,22 +474,28 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         //华泰没有总订单号，使用自定义订单号
         String orderNo = IdGenerate.nextId();
         insAreaCompany.setId(orderNo);
-        insAreaCompany.setInsOrderNo(orderNo);
         insAreaCompany.setJqapplyno(quoteRespVo.getJqApplyNo());
         insAreaCompany.setSyapplyno(quoteRespVo.getSyApplyNo());
         HuaTaiQuotedPriceResponse.ContractDto.TaxDto taxDto = null;
         List<HuaTaiQuotedPriceResponse.ContractDto> contractDtoList = quotedPriceResponse.getBusinessData().getContract();
+        String jqQuerySequenceNo = " ";
+        String syQuerySequenceNo = " ";
         for(HuaTaiQuotedPriceResponse.ContractDto contractDto:contractDtoList) {
             HuaTaiQuotedPriceResponse.ContractDto.ContractMainDto contractMain = contractDto.getContractMain();
+            HuaTaiQuotedPriceResponse.ContractDto.PlatFormMessageDto platFormMessageDto = contractDto.getPlatFormMessage();
             if ("1002".equals(contractMain.getRiskCode())) {
+                jqQuerySequenceNo = platFormMessageDto.getQuerySequenceNo();
                 taxDto = contractDto.getTax();
                 // 车船税
                 TaxArrears taxArrears = new TaxArrears("往年欠税",taxDto.getSumTaxDefault(), taxDto.getSumOverdue());
                 List<TaxArrears> taxArrearsList = Collections.singletonList(taxArrears);
                 insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(taxArrearsList)));
                 quoteRespVo.setTaxArrears(taxArrearsList);
+            }else{
+                syQuerySequenceNo = platFormMessageDto.getQuerySequenceNo();
             }
         }
+        insAreaCompany.setInsOrderNo(jqQuerySequenceNo+"-"+syQuerySequenceNo);
         quoteRespVo.setCompanyId(insAreaCompany.getId());
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
         return HttpResult.ok(quotedPriceResponse.getHead().getReturnMessage(), quoteRespVo);