Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/component/HuaTaiCrawlerCacheComponent.java

@@ -62,7 +62,7 @@ public class HuaTaiCrawlerCacheComponent {
     public void cacheYingXiangUploaded(String yx) {
         Map<String, String> authorizationMap = new HashMap<>();
 
-        authorizationMap.put(YINGXIANG_UPLOADED, yx);
+        authorizationMap.put(YINGXIANG_UPLOADED + yx, yx);
         RMap<Object, Object> map = redissonClient.getMap(HUATAI_YINGXIANG_UPLOADED);
         map.putAll(authorizationMap);
         map.expire(Duration.ofDays(30L));
@@ -80,8 +80,8 @@ public class HuaTaiCrawlerCacheComponent {
         return (String) redissonClient.getMap(accountKey(HUATAI_COMCODE, username, comcode)).get(COMCODE);
     }
 
-    public String getYingXiangUploaded() {
-        return (String) redissonClient.getMap(HUATAI_YINGXIANG_UPLOADED).get(YINGXIANG_UPLOADED);
+    public String getYingXiangUploaded(String yx) {
+        return (String) redissonClient.getMap(HUATAI_YINGXIANG_UPLOADED).get(YINGXIANG_UPLOADED + yx);
     }
 
     public void clearLoginCache(String username, String comcode) {

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/crawler/service/Impl/HuaTaiCrawlerRequestImpl.java

@@ -1045,7 +1045,7 @@ public class HuaTaiCrawlerRequestImpl implements HuaTaiCrawlerRequest {
         doLoginCookie(attr);
         HtCrawlerOrder order = orderService.findByOrdersNo(orderBase.getOrdersNo());
 
-        String uploaded = cache.getYingXiangUploaded();
+        String uploaded = cache.getYingXiangUploaded(order.getQuotationRelaNo());
         if (StringUtils.isNotBlank(uploaded) && uploaded.equals(order.getQuotationRelaNo())) return;
 
         HtCrawlerConfigureParameters params = ConfigureParametersConversion.conversionEntity(

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

@@ -656,10 +656,10 @@ public class OrderOperationLogAspect {
             // 组装报价成功返回参数
             StringBuffer successResult = new StringBuffer();
             successResult.append(res.getCosts().getSumPremium()+", ");
-            successResult.append("交强（" + res.getCosts().getCiPremium() + "）, ");
-            successResult.append("商业（" + res.getCosts().getBiPremium() + "）, ");
-            successResult.append("驾意险（" + res.getCosts().getNiPremium() + "）, ");
-            successResult.append("车船税（" + res.getCosts().getVvTax() + "）; ");
+            successResult.append("交强（" + (res.getCosts().getCiPremium() != null ? res.getCosts().getCiPremium() : 0) + "）, ");
+            successResult.append("商业（" + (res.getCosts().getBiPremium() != null ? res.getCosts().getBiPremium() : 0) + "）, ");
+            successResult.append("驾意险（" + (res.getCosts().getNiPremium() != null ? res.getCosts().getNiPremium() : 0) + "）, ");
+            successResult.append("车船税（" + (res.getCosts().getVvTax() != null ? res.getCosts().getVvTax() : 0) + "）; ");
             trackSccess.setResult(successResult.toString());
             trackSccess.setCompanyId(insOrders.getCompanyId());
             trackSccess.setLicenseNo(carInfo.getLicenseNo());

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

@@ -93,7 +93,7 @@ public class InsOrderRightsInfoServiceImpl implements InsOrderRightsInfoService
                 List<InsOrderRightsPackage> insOrderRightsPackageList = new ArrayList<>();
                 for(InsOrderRightsPackageDto insOrderRightsPackageDto:insOrderRightsPackageDtoList){
                     InsOrderRightsPackage insOrderRightsPackage = new InsOrderRightsPackage();
-                    BeanUtils.copyProperties(insOrderRightsPackage,insOrderRightsPackageDto);
+                    BeanUtils.copyProperties(insOrderRightsPackageDto,insOrderRightsPackage);
                     //获取接收人信息入库
                     RightsGrantReceiverDTO rightsGrantReceiverDTO  = insOrderRightsInfoDto.getRightsGrantReceiverDTO();
                     insOrderRightsPackage.setReceiverMobile(rightsGrantReceiverDTO.getReceiverMobile());

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

@@ -228,11 +228,19 @@ public final class ZmCrawlerQuoteResultVoBuild {
             }
         }
 
-        if (apQtnResultXom.getGusunlightresultmainDto() != null) {
-            scoreJson.add(new JSONObject()
-                    .fluentPut("scoreName", "中煤分")
-                    .fluentPut("scoreKey","zmScore")
-                    .fluentPut("score", apQtnResultXom.getGusunlightresultmainDto().getZmScoreTranche()));
+        if (apQtnResultXom != null && apQtnResultXom.getGusunlightresultmainDto() != null) {
+            String zmScore = apQtnResultXom.getGusunlightresultmainDto().getZmScoreTranche();
+            if (zmScore != null && zmScore.matches("\\d+")) {  // 判断是否全为数字
+                scoreJson.add(new JSONObject()
+                        .fluentPut("scoreName", "中煤数字分")
+                        .fluentPut("scoreKey", "zmScoreNumber")
+                        .fluentPut("score", zmScore));
+            } else {
+                scoreJson.add(new JSONObject()
+                        .fluentPut("scoreName", "中煤字母分")
+                        .fluentPut("scoreKey", "zmScoreAlphabet")
+                        .fluentPut("score", zmScore));
+            }
         }
         if (quotedPriceResponse != null) {
             scoreJson.add(new JSONObject()

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

@@ -378,6 +378,19 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
                     }
                 }
 
+                // min 字段根据 minArray 进行重组（前端批量模式下传的是 minArray）
+                if (CollUtil.isNotEmpty(group.getRulesAttrList())) {
+                    group.getRulesAttrList().forEach(attr -> {
+                        if (attr.getMinArray() != null && attr.getMinArray().length > 0) {
+                            attr.setMin(String.join(",", attr.getMinArray()));
+                        }
+                        // 处理中文逗号
+                        if (attr.getMin() != null && attr.getMin().contains("，")) {
+                            attr.setMin(attr.getMin().replace("，", ","));
+                        }
+                    });
+                }
+
                 List<PtlAgreementUndwrtRulesAttrLink> andAttrLinks = processAndAttrs(group.getRulesAttrList(), undwrtRulesAttrList, ruleId);
 
                 // 已有规则做差异比较更新，避免全删全插产生垃圾数据