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

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2146,6 +2146,14 @@ public class OrderAdapter {
                 long currentTime = System.currentTimeMillis();
                 long gmtModified = orderBean.getGmtModified();
 
+                // 因允许退款日期在外卖类型的value中，如果订单类型为堂食，则会取不到这个值
+                if (!OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
+                    configStr = redisCache.hashGet(MessageFormat.format(KgdRedisKeyConstant.ORDER_REFUND_CONFIG, orderBean.getCompanyId(), wxAppId), KgdRedisKeyConstant.REFUND_CFG_TAKE_OUT);
+                    if (StringUtils.isNotEmpty(configStr)) {
+                        // 将允许退款日期的配置放到config中
+                        config.put(OrderRefundEnum.REFUND_DATA_RANGE.getKeyValue(), JSON.parseObject(configStr).getString(OrderRefundEnum.REFUND_DATA_RANGE.getKeyValue()));
+                    }
+                }
                 long value = 0L;
                 String refundDateConfig = config.getString(OrderRefundEnum.REFUND_DATA_RANGE.getKeyValue());
                 if (null != refundDateConfig) {