修改bug

commons/src/main/java/com/jzg/commons/entity/dto/PtlAgreementCostCopyParam.java

@@ -14,5 +14,10 @@ public class PtlAgreementCostCopyParam extends PageRequest {
     @Schema(description = "需要复制的费用id")
     private String costId;
 
+    @Schema(description = "需要复制的协议id")
+    private String agreementId;
+
+    @Schema(description = "承保规则id")
+    private String coverRuleId;
 
 }

platform/src/main/java/com/jzg/service/impl/PtlInsAttributionTemplateServiceImpl.java

@@ -165,6 +165,7 @@ public class PtlInsAttributionTemplateServiceImpl extends ServiceImpl<PtlInsAttr
         AssertionUtils.isEmpty(company, "保司不存在");
         LambdaQueryWrapper<PtlAgreementAttribution> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PtlAgreementAttribution::getInsCompanyId,companyId);
+        wrapper.eq(PtlAgreementAttribution::getIsDelete,0);
         List<PtlAgreementAttribution> ptlAgreementAttribution = agreementAttributionMapper.selectList(wrapper);
         AssertionUtils.isEmpty(ptlAgreementAttribution, "账号归属信息查询失败");
         return HttpResult.ok(ptlAgreementAttribution);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -62,7 +62,7 @@ public class QuoteVerificationAspect {
     private final InsOrdersOtherService insOrdersOtherService;
 
     private final InsFeeOrdersService insFeeOrdersService;
-    private static final Logger log = LoggerFactory.getLogger("fee");
+    private static final Logger log = LoggerFactory.getLogger(QuoteVerificationAspect.class);
 
     private final BaseController baseController;
     private final PtlNewAgreementClient ptlNewAgreementClient;
@@ -212,6 +212,7 @@ public class QuoteVerificationAspect {
             List<PtlAgreementUndwrtRulesDictLabal> undwrtRulesDictList = ptlNewAgreementClient.getUndwrtRulesDictList();
 
             if (FactorMatch.judgements(agreementProductCosts.get(i).getPtlAgreementCostRuleList(),ruleAttrMappingVoList,undwrtRulesAttrList,logs, undwrtRulesDictList)) {
+                log.info("匹配到的费用id:{}",agreementProductCosts.get(i).getId());
                 return agreementProductCosts.get(i).getId();
             }
             log.debug("当前费用因子匹配结束\n");

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/consumer/template/LotteryMessageTemplate.java

@@ -1,6 +1,7 @@
 package com.jzg.quotation.summary.consumer.template;
 
 
+import com.jzg.commons.entity.enums.MessageCodeEnum;
 import com.jzg.commons.entity.enums.MessageTopicEnum;
 import com.jzg.commons.entity.enums.MessageTypeEnum;
 import com.jzg.quotation.summary.consumer.message.LotteryMessage;
@@ -28,6 +29,7 @@ public class LotteryMessageTemplate extends RocketMQEnhanceTemplate {
     public SendResult addLottery(String userId) {
         LotteryMessage message = new LotteryMessage();
         message.setReceiverUser(userId);
+        message.setTplCode(MessageCodeEnum.TEMPLATE_13.getCode());
         SendResult result = send(MessageTopicEnum.ROCKET_SYSTEM.getCode(), MessageTypeEnum.LOTTERY.getCode(), message);
         return result;
     }

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

@@ -9,6 +9,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.orders.po.*;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.QrBarcodeConfig;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.LocalDateTimeUtils;
 import com.jzg.commons.util.StringUtils;
@@ -80,6 +81,7 @@ public class QrCodeController extends BaseController {
         result.put("taxPremium",insOrdersCosts.getTaxPremium());
         result.put("sumPremium",insOrdersCosts.getSumPremium());
         result.put("createTime",orders.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        result.put("company",orders.getCompanyName());
         result.put("jqStartTime","");
         result.put("syStartTime","");
         insOrdersRiskList.forEach(risk->{
@@ -92,7 +94,11 @@ public class QrCodeController extends BaseController {
         });
 
 
-        insOrdersQrcodeService.getOneOrSave(orders);
+        InsOrdersQrcode ordersQrcode = insOrdersQrcodeService.getOneOrSave(orders);
+        if(ordersQrcode.getJumpUrl() == null || ordersQrcode.getJumpUrl().isEmpty()){
+            throw new SystemException("订单不存在支付连接");
+        }
+
         String qrCodeUrl = qrCodeGenAddress + "?orderNo=" + orders.getId();
         result.put("qrcode",qrCodeUrl);
         ModelAndView modelAndView = new ModelAndView(new MappingJackson2JsonView());

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -409,6 +409,8 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
         // 调整数据 进行copy
         String costId = IdGenerate.nextId();
         ptlAgreementCost.setId(costId);
+        ptlAgreementCost.setPtlAgreementId(costCopyParam.getAgreementId());
+        ptlAgreementCost.setCoverRuleId(costCopyParam.getCoverRuleId());
         ptlAgreementCost.setCostDescribe("复制的费用:" + ptlAgreementCost.getCostDescribe());
         ptlAgreementCost.setCreateTime(LocalDateTime.now());
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jzg.commons.constants.ProductsType;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.action.enums.ActionEnum;
@@ -591,6 +592,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         String newSchemeInfoId = IdGenerate.nextId();
         ptlScheme.setId(newSchemeId);
         ptlScheme.setProductId(productCode);
+        ptlScheme.setProductName(ProductsType.getByCode(productCode).getDesc());
 
         ptlSchemeInfo.setId(newSchemeInfoId);
         ptlSchemeInfo.setSchemeId(newSchemeId);