Merge branch '20210811-生态配置redis结构改造-zhiwei.zha' into qa

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

@@ -1978,7 +1978,7 @@ public class OrderServiceImpl implements Orderservice {
                 }
             }else {
                 // 查询小程序是否配置了退运费
-                String configStr = redisCache.hashGet(KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT, MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, orderBean.getCompanyId(), wxAppId));
+                String configStr = redisCache.hashGet(MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, orderBean.getCompanyId(), wxAppId), KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT);
                 if (StringUtils.isNotEmpty(configStr)) {
                     JSONObject config = JSON.parseObject(configStr);
                     String refundDeliveryFeeConfig = config.getString(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -615,7 +615,7 @@ public class OrderVerifyHandle {
 
         // 查询小程序配置的退款设置
         String hkey = OrderType.TAKE_OUT.getCode().equals(data.getOrderType()) ? KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT : KgdRedisKeyConstant.REFUND_CFG_EAT_IN;
-        String configStr = redisCache.hashGet(hkey, MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, data.getCompanyId(), extInfo.getAppid()));
+        String configStr = redisCache.hashGet(MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, data.getCompanyId(), extInfo.getAppid()), hkey);
         if (StringUtils.isEmpty(configStr)) {
             return true;
         }