Merge remote-tracking branch 'origin/master'

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

@@ -724,7 +724,7 @@ public class UnifyOrderManager {
         insOrdersService.orderAfterUpdateOrderStatus(orderStatusVo.getOrder().getOrdersNo(), orderStatusResultVo);
         // 保存支付链接
         insOrders.setPayLink(orderStatusResultVo.getPaymentLink());
-        insOrdersQrcodeService.saveQrCode(insOrders);
+        insOrdersQrcodeService.updateQrCode(insOrders);
         //////////////////////////////////////////新增营销抽奖活动////////////////////////////////////////////////
         // 承保(客户)、出单(业务员)
         if(orderStatusResultVo.getOrderStatus() == InsOrderStatusEnum.UNDERWRITED){

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

@@ -44,6 +44,7 @@ public interface InsOrdersQrcodeService extends IService<InsOrdersQrcode> {
         List<InsOrdersQrcode> insOrderQrCodes = lambdaQuery()
                 .eq(InsOrdersQrcode::getOrderno, orderNo)
                 .eq(InsOrdersQrcode::getQrcodeStatus, 1)
+                .orderByDesc(InsOrdersQrcode::getCreatetime)
                 .list();
         if (insOrderQrCodes.isEmpty()) {
 //            throw new SystemException("缴费二维码还未生成请点击二维码生成。");

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

@@ -942,7 +942,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         InsOrdersQrcode insOrdersQrcode = new InsOrdersQrcode();
         insOrdersQrcode.setId(IdGenerate.nextId());
         insOrdersQrcode.setOrderno(underwritingResultsVo.getOrdersNo());
-        String paylink = "";
+        String paylink = insOrders.getPayLink();
         if (isHttpUrl(insOrders.getPayLink())) {
             paylink = insOrders.getPayLink().replace("{", "").replace("}", "");
             insOrdersQrcode.setJumpUrl(paylink);

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/build/ZmCrawlerSubmitResultVoBuild.java

@@ -17,6 +17,7 @@ import java.util.function.BiConsumer;
 
 public final class ZmCrawlerSubmitResultVoBuild {
     public static UnderwritingResultsVo build(ZmCrawlerSubmitResponse submitResponse, ZmCrawlerOrder zmCrawlerOrder, UnderwritingResultsVo vo) {
+        vo.setCompanyOrderNo(zmCrawlerOrder.getBussinessNo());
         if (submitResponse == null || submitResponse.getHead() == null) {
             vo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
             vo.setUnderwritingResult("请求参数为空");
@@ -29,7 +30,7 @@ public final class ZmCrawlerSubmitResultVoBuild {
             return vo;
         }
 
-        // 核保成功 获取投保单号列表
+        // 核保成功 人工处理 获取投保单号列表
         List<ZmCrawlerSubmitResponse.AppliResultDTO> appliResults = submitResponse.getAppliResult();
         if (CollectionUtils.isEmpty(appliResults) || CollectionUtils.isEmpty(appliResults.get(0).getSubContractNos())) {
             return vo;