合并冲突

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/constant/OrderRedisKeyConstant.java

@@ -63,6 +63,15 @@ public class OrderRedisKeyConstant {
     }
 
 
+    /**
+     *  下单时 支付商品名称redis缓存key，懒加载方式，有效时间为24小时
+     *  {0}：商户号
+     *
+     *  value：hash结构
+     *      hashKey：小程序id wxAppId
+     *      hashValue： 支付商户名称
+     */
+    public static final String PARTNER_PAYMENT_PRINCIPAL_NAME = "kgd:order:payment:principalName:{0}";
 
 
 

order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

@@ -3,7 +3,6 @@ package cn.freemud.service.impl;
 import cn.freemud.adapter.OrderAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
-import cn.freemud.constant.KgdRedisKeyConstant;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.SvcComPayRequestDto;
@@ -66,6 +65,7 @@ import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentClos
 import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import com.freemud.sdk.api.assortment.order.constant.OrderRedisKeyConstant;
 import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderEditRequest;
@@ -482,7 +482,7 @@ public class PayServiceImpl {
      * 查询支付配置
      */
     private String getPaymentPrincipalName(String partnerId, String appId) {
-        String redisKey = MessageFormat.format(KgdRedisKeyConstant.PARTNER_PAYMENT_PRINCIPAL_NAME, partnerId);
+        String redisKey = MessageFormat.format(OrderRedisKeyConstant.PARTNER_PAYMENT_PRINCIPAL_NAME, partnerId);
         // 先从redis中查询支付商户名称
         String principalName = redisCache.hashGet(redisKey, appId);
         if (StringUtils.isEmpty(principalName)) {