修改bug

commons/src/main/java/com/jzg/commons/entity/quote/vo/base/OrderBase.java

@@ -57,7 +57,7 @@ public class OrderBase implements Serializable {
      */
     private String productId;
 
-    private String productsCode;
+//    private String productsCode;
 
     /**
      * @see ApiType

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

@@ -261,9 +261,9 @@ public class UnifyOrderManager {
             // 报价后更新订单
             insOrdersService.orderAfterUpdateQuote(ordersNo, quoteResultsVo);
         }catch(Exception e){
-            //更新失败报价
-            insOrdersService.orderAfterUpdateFailedQuote(ordersNo, e.getMessage());
-            throw new SystemException(e.getMessage());
+            Throwable root = e.getCause() != null ? e.getCause() : e;
+            insOrdersService.orderAfterUpdateFailedQuote(ordersNo, root.getMessage());
+            throw new SystemException(root.getMessage());
         }
         return quoteResultsVo.getQuoteStatusEnum()
                 .equals(InsOrderStatusEnum.WAIT_AUDIT) ? HttpResult.ok(quoteResultsVo) : HttpResult.error(quoteResultsVo);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -397,20 +397,21 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
         if (CollectionUtil.isNotEmpty(insOrdersVo.getInsOrdersRiskList())){
             insOrdersVo.getInsOrdersRiskList().forEach(riskInfo -> {
-                if (StringUtils.equals(riskInfo.getRiskCode(),"0507")){
-                    insOrdersVo.setCiRiskInfoVo(getRiskInfoVo(riskInfo));
-                    List<KindInfoVo> kindInfoVos = insOrdersVo.getKindInfoVo();
-                    InsOrdersCosts insOrdersCosts = insOrdersVo.getInsOrdersCosts();
-                    KindInfoVo jqKind = new KindInfoVo();
-                    jqKind.setKindCode("J1");
-                    jqKind.setKindName("交强险");
-                    if(Objects.nonNull(insOrdersCosts.getJqPremium())){
-                        jqKind.setPremium(insOrdersCosts.getJqPremium().toString());
-                    }
-                    kindInfoVos.add(jqKind);
-                }else {
-                    insOrdersVo.setBiRiskInfoVo(getRiskInfoVo(riskInfo));
-                }
+                insOrdersVo.setBiRiskInfoVo(getRiskInfoVo(riskInfo));
+//                if (StringUtils.equals(riskInfo.getRiskCode(),"0507")){
+//                    insOrdersVo.setCiRiskInfoVo(getRiskInfoVo(riskInfo));
+//                    List<KindInfoVo> kindInfoVos = insOrdersVo.getKindInfoVo();
+//                    InsOrdersCosts insOrdersCosts = insOrdersVo.getInsOrdersCosts();
+//                    KindInfoVo jqKind = new KindInfoVo();
+//                    jqKind.setKindCode("J1");
+//                    jqKind.setKindName("交强险");
+//                    if(Objects.nonNull(insOrdersCosts.getJqPremium())){
+//                        jqKind.setPremium(insOrdersCosts.getJqPremium().toString());
+//                    }
+//                    kindInfoVos.add(jqKind);
+//                }else {
+//                    insOrdersVo.setBiRiskInfoVo(getRiskInfoVo(riskInfo));
+//                }
             });
         }
         // 订单电子保单信息
@@ -836,9 +837,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrders.setApiType(String.valueOf(quoteVo.getOrder().getApiType()));
         insOrders.setCompanyId(quoteVo.getOrder().getInsuranceCompanyCode());
         insOrders.setCompanyName(companyName);
-        insOrders.setProductId(quoteVo.getProductId());
-        insOrders.setProductName(ProductsType.getProductNameByCode(quoteVo.getProductId()));
-        String productName = ProductsType.getProductNameByCode(quoteVo.getProductId());
+        insOrders.setProductId(quoteVo.getOrder().getProductId());
+        insOrders.setProductName(ProductsType.getProductNameByCode(quoteVo.getOrder().getProductId()));
+        String productName = ProductsType.getProductNameByCode(quoteVo.getOrder().getProductId());
         insOrders.setProductName(productName);
         if(Objects.isNull(insOrders.getRealQuoteUserId())) {
             insOrders.setRealQuoteUserId(baseController.getUserName());
@@ -905,9 +906,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrders.setApiType(String.valueOf(quoteVo.getOrder().getApiType()));
         insOrders.setCompanyId(quoteVo.getOrder().getInsuranceCompanyCode());
         insOrders.setCompanyName(companyName);
-        insOrders.setProductId(quoteVo.getProductId());
-        insOrders.setProductName(ProductsType.getProductNameByCode(quoteVo.getProductId()));
-        String productName = ProductsType.getProductNameByCode(quoteVo.getProductId());
+        insOrders.setProductId(quoteVo.getOrder().getProductId());
+        insOrders.setProductName(ProductsType.getProductNameByCode(quoteVo.getOrder().getProductId()));
+        String productName = ProductsType.getProductNameByCode(quoteVo.getOrder().getProductId());
         insOrders.setProductName(productName);
         if(Objects.isNull(insOrders.getRealQuoteUserId())) {
             insOrders.setRealQuoteUserId(baseController.getUserName());
@@ -1015,9 +1016,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
         resultVo.setImageVoList(imageVoList);
         // 支付码
-        InsOrdersQrcode qrcode = insOrdersQrcodeMapper.selectOne(new LambdaQueryWrapper<InsOrdersQrcode>()
-                .eq(InsOrdersQrcode::getOrderno, ordersNo));
-        resultVo.setQrcode(qrcode);
+        List<InsOrdersQrcode> qrcodes = insOrdersQrcodeMapper.selectList(new LambdaQueryWrapper<InsOrdersQrcode>()
+                .eq(InsOrdersQrcode::getOrderno, ordersNo)
+                .orderByDesc(InsOrdersQrcode::getCreatetime));
+        if(qrcodes.size()>0) {
+            resultVo.setQrcode(qrcodes.get(0));
+        }
         // 费用信息
         InsFeeOrders insFeeOrders = insFeeOrdersMapper.selectOne(new LambdaQueryWrapper<InsFeeOrders>()
                 .eq(InsFeeOrders::getOrderNo, ordersNo));

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

@@ -85,7 +85,7 @@ public class ZiJinApiRequestImpl implements ZiJinApiRequest {
                 .getConfigInfo());
         HttpHeaders httpHeaders = ziJinApiRequestComponent.getHttpHeaders(parameters);
         List<SpecialAppointmentsVo> specialAppointmentsVos = underwritingVo.getSpecialAppointmentsVos();
-        SubmitVerifyRequest submitVerifyRequest = new SubmitVerifyRequest(ziJinApiOrder, orderBase.getProductsCode(), specialAppointmentsVos);
+        SubmitVerifyRequest submitVerifyRequest = new SubmitVerifyRequest(ziJinApiOrder, orderBase.getProductId(), specialAppointmentsVos);
 
         UnderwritingResultsVo underwritingResultsVo = new UnderwritingResultsVo();
         try {

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/service/Impl/ZiJinCrawlerOrderServiceImpl.java

@@ -21,7 +21,7 @@ public class ZiJinCrawlerOrderServiceImpl implements ZiJinCrawlerOrderService {
         ziJinApiOrder.setId(quoteVo.getOrder().getOrdersNo());
         ziJinApiOrder.setOrderNo(modelQueryResponse.getOrderNo());
         ziJinApiOrder.setOrderId(modelQueryResponse.getOrderId());
-        ziJinApiOrder.setProductsCode(quoteVo.getOrder().getProductsCode());
+        ziJinApiOrder.setProductsCode(quoteVo.getOrder().getProductId());
         ziJinApiOrder.setInsuredIdentify(quoteVo
                 .getInsuredPersonInfo()
                 .getIdentifyNumber());