紫金rediskeybug

国任bug处理
报价业务员接收

rocketmq/src/main/java/com/jzg/templete/RocketMQEnhanceTemplate.java

@@ -19,7 +19,7 @@ import org.springframework.util.StringUtils;
  * RocketMQ增强模板类，优先使用
  */
 @Slf4j
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor
 public class RocketMQEnhanceTemplate {
     private final RocketMQTemplate template;
 

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/entity/Request/NonAutoInsOrderRequest.java

@@ -1,7 +1,9 @@
 package com.jzg.quotation.guoren.api.entity.Request;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
@@ -14,6 +16,8 @@ import com.jzg.quotation.guoren.api.entity.Response.VinQueryResponse;
 import com.jzg.quotation.guoren.api.entity.vo.GuoRenAccidentalDrivingVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -32,6 +36,8 @@ import java.util.List;
 @NoArgsConstructor
 public class NonAutoInsOrderRequest {
 
+    private static final Logger log = LoggerFactory.getLogger(NonAutoInsOrderRequest.class);
+
     /**
      * 渠道代码
      */
@@ -146,9 +152,13 @@ public class NonAutoInsOrderRequest {
                 this.orderAppl = new OrderApplDTO(policyHolder);
 
                 // 订单信息
-                List<RiskInfoVo> riskList = new ArrayList<>(); 
-                riskList.add(quoteVo.getCiRiskInfoVo());
-                riskList.add(quoteVo.getBiRiskInfoVo());
+                List<RiskInfoVo> riskList = new ArrayList<>();
+                if(quoteVo.getCiRiskInfoVo() != null) {
+                    riskList.add(quoteVo.getCiRiskInfoVo());
+                }
+                if(quoteVo.getBiRiskInfoVo() != null) {
+                    riskList.add(quoteVo.getBiRiskInfoVo());
+                }
 
                 this.orderMain = new OrderMainDTO(riskList, accidentalDrivingVo, parameters.getHandlerCode(), carPriceUuid);
 
@@ -303,6 +313,7 @@ public class NonAutoInsOrderRequest {
                     if (riskList.size() == 1) {
                         return riskList.get(0);
                     } else {
+                        log.info("国任riskList:{}", JSON.toJSONString(riskList));
                         RiskInfoVo riskInfoVo1 = riskList.get(0);
                         RiskInfoVo riskInfoVo2 = riskList.get(1);
                         String startDate1 = riskInfoVo1.getStartDate();

tenant/insurance/quotation-huatai/src/main/java/com/jzg/quotation/huatai/api/service/Impl/HuaTaiApiRequestImpl.java

@@ -116,7 +116,10 @@ public class HuaTaiApiRequestImpl implements HuaTaiApiRequest {
                     HuaTaiQuotedPriceResponse.class, parameters.getInsuredCode(), url);
             if (ObjectUtil.isNotNull(quotedPriceResponse) && !quotedPriceResponse.getHead().getReturnCode().equals("0")) {
                 log.error("报价失败,返回信息：{}", quotedPriceResponse.getHead().getReturnMessage());
-                throw new SystemException("报价失败");
+                QuoteResultsVo quoteResultsVo = new QuoteResultsVo();
+                quoteResultsVo.setErrorMessage(quotedPriceResponse.getHead().getReturnMessage());
+                quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.QUOTE_FAIL);
+                return quoteResultsVo;
             }else {
                 log.info("报价成功,返回信息：{}", JSONObject.toJSONString(quotedPriceResponse));
             }

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

@@ -1003,7 +1003,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
         String productName = ProductsType.getProductNameByCode(quoteVo.getOrder().getProductId());
         insOrders.setProductName(productName);
-        if (Objects.isNull(insOrders.getRealQuoteUserId())) {
+        if (Objects.isNull(quoteVo.getOrder().getRealQuoteUserId())) {
             insOrders.setRealQuoteUserId(baseController.getUserName());
         } else {
             insOrders.setRealQuoteUserId(quoteVo.getOrder().getRealQuoteUserId());

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/component/ZiJinApiCacheComponent.java

@@ -1,9 +1,13 @@
 package com.jzg.quotation.zijin.api.component;
 
+import com.jzg.quotation.zijin.api.service.Impl.ZiJinApiRequestImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
+import org.redisson.client.codec.StringCodec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
@@ -12,11 +16,12 @@ import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 
-@Log4j2
 @Component
 @RequiredArgsConstructor
 public class ZiJinApiCacheComponent {
 
+    private static final Logger log = LoggerFactory.getLogger(ZiJinApiCacheComponent.class);
+
     private final RedissonClient redissonClient;
     /**
      * 紫金财险授权
@@ -44,7 +49,8 @@ public class ZiJinApiCacheComponent {
         map.put(AUTHORIZATION, authorization);
         map.put(ZKI_API_AUTHORIZATION, ZKIApiAuthorization);
         // 3.1 存入redis中
-        RMap<Object, Object> rMap = redissonClient.getMap(ZIJIN_AUTHORIZATION + appKey);
+
+        RMap<String, String> rMap = redissonClient.getMap(ZIJIN_AUTHORIZATION + appKey, StringCodec.INSTANCE);
         rMap.putAll(map);
         rMap.expire(Duration.ofHours(ZIJIN_AUTHORIZATION_TIME));
     }
@@ -52,10 +58,10 @@ public class ZiJinApiCacheComponent {
     public HttpHeaders getAuthorizationHeader(String appKey) {
         HttpHeaders httpHeaders = new HttpHeaders();
         String authorization = (String) redissonClient
-                .getMap(ZIJIN_AUTHORIZATION + appKey)
+                .getMap(ZIJIN_AUTHORIZATION + appKey, StringCodec.INSTANCE)
                 .get(AUTHORIZATION);
         String zKIApiAuthorization = (String) redissonClient
-                .getMap(ZIJIN_AUTHORIZATION + appKey)
+                .getMap(ZIJIN_AUTHORIZATION + appKey, StringCodec.INSTANCE)
                 .get(ZKI_API_AUTHORIZATION);
         // 缓存中不存在就去请求token
         if (!ObjectUtils.isEmpty(authorization) && !ObjectUtils.isEmpty(zKIApiAuthorization)) {

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

@@ -101,6 +101,9 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
             List<String> typeAttrs = infos.stream().map(SysUserJzgInfo::getTypeAttr).collect(Collectors.toList());
             infoVo.setTypeNames(typeAttrs);
         }
+        if(infos.size() == 0){
+            throw new SystemException("找不到用户信息");
+        }
         SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getOne(new LambdaQueryWrapper<SysUserJzgInfo>()
                 .eq(SysUserJzgInfo::getUserId, infoVo.getUserId()).eq(SysUserJzgInfo::getSystemCode, baseController.getAppSystemCode()));
         infoVo.setInfoId(sysUserJzgInfo.getId());