Merge branch '20211012-订单商户全程信息不直接查库改造-zhiwei.zha' into 20211019-无单收银-zhiwei.zha

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/constant/KgdRedisKeyConstant.java

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

@@ -3,6 +3,7 @@ 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;
@@ -84,6 +85,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.text.MessageFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -457,15 +459,21 @@ public class PayServiceImpl {
 
 
     /**
-     * 处理定制化逻辑
+     * 查询支付配置
      */
     private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId, String appId, String payCode, String storeId) {
-        PaymentRequest paymentRequest = this.orderBodyConvertToPaymentBody(openId, partnerId, appId, payCode);
-        // fisherman 2227 测试商户号, 下个版本需要删除
-        boolean isTrue = "2080".equals(partnerId);
-        if (isTrue) {
+        //设置支付信息
+        PaymentRequest paymentRequest = new PaymentRequest();
+        paymentRequest.setOpenId(openId);
+        paymentRequest.setWxAppId(appId);
+        paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl);
+        paymentRequest.setPayCode(payCode);
+        if ("2080".equals(partnerId)) {
             //【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
             paymentRequest.setPrincipalName("蜜雪冰城" + storeId + "店");
+        } else {
+            // saas 查询小程序配置
+            paymentRequest.setPrincipalName(this.getPaymentPrincipalName(partnerId, appId));
         }
         return paymentRequest;
     }
@@ -473,20 +481,28 @@ public class PayServiceImpl {
     /**
      * 查询支付配置
      */
-    private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId, String appId, String payCode) {
-        //设置支付信息
-        PaymentRequest paymentRequest = new PaymentRequest();
-        paymentRequest.setOpenId(openId);
-        paymentRequest.setWxAppId(appId);
-        AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, appId);
-        AssortmentOpenPlatformPartner platformPartner = null;
-        if (wxApp == null) {
-            platformPartner = assortmentOpenPlatformPartnerManager.selectOpenPlatformPartner(partnerId);
+    private String getPaymentPrincipalName(String partnerId, String appId) {
+        String redisKey = MessageFormat.format(KgdRedisKeyConstant.PARTNER_PAYMENT_PRINCIPAL_NAME, partnerId);
+        // 先从redis中查询支付商户名称
+        String principalName = redisCache.hashGet(redisKey, appId);
+        if (StringUtils.isEmpty(principalName)) {
+            AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, appId);
+            if (wxApp == null || StringUtils.isEmpty(wxApp.getPrincipalName())) {
+                // 小程序如果没有配置支付商户名称，则去商户名称替代
+                AssortmentOpenPlatformPartner platformPartner = assortmentOpenPlatformPartnerManager.selectOpenPlatformPartner(partnerId);
+                if (null != platformPartner) principalName = platformPartner.getCompanyName();
+            } else {
+                principalName = wxApp.getPrincipalName();
+            }
+            if (StringUtils.isEmpty(principalName)) {
+                //如果还是没有查到，就用非码代替
+                principalName = "上海非码网络科技有限公司";
+            }
+            // 加载到redis，有效期一天
+            redisCache.hashPut(redisKey, appId, principalName);
+            redisCache.updateTTL(redisKey, 24, TimeUnit.HOURS);
         }
-        paymentRequest.setPrincipalName(wxApp != null ? wxApp.getPrincipalName() : platformPartner != null ? platformPartner.getCompanyName() : "上海非码网络科技有限公司");
-        paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl);
-        paymentRequest.setPayCode(payCode);
-        return paymentRequest;
+        return principalName;
     }