Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' into qa

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

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

@@ -138,6 +138,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.util.StringUtil;
 
@@ -258,6 +259,8 @@ public class OrderServiceImpl implements Orderservice {
     private OfflineCouponSdkService offlineCouponSdkService;
     @Autowired
     private DeliveryFeiginClient deliveryFeiginClient;
+    @Autowired
+    private RedisTemplate redisTemplate;
 
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
@@ -442,8 +445,11 @@ public class OrderServiceImpl implements Orderservice {
             //orderRefund(orderBean, "订单异常退款", openid, oid);
             return gson.toJson(message);
         }
-        //获取生态缓存中的配置项，如果mealCodeRule的值不为空并且值等于2，则随机生成取参数，当日不重复
-        String mealCodeRule = redisCache.getValue("mealCodeRule");
+        List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = this.cacheSelectDefaultPage(wxappid, "2");
+        Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
+        AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get("mealCodeRule");
+        String mealCodeRule = refundDeliveryFeeConfig.getAppValue();
+        log.info("partnerWxappConfigs:configMap:refundDeliveryFeeConfig：mealCodeRule{},{},{},{}",partnerWxappConfigs,configMap,refundDeliveryFeeConfig,mealCodeRule);
         if(!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)){
             //更新db中的取餐码,生成取餐码
             OrderModifyRelatingCodeReq relatingCodeReq =new OrderModifyRelatingCodeReq();
@@ -3002,4 +3008,14 @@ public class OrderServiceImpl implements Orderservice {
                 }).getPartnerValue();
     }
 
+    public List<AssortmentOpenPlatformPartnerWxappConfig> cacheSelectDefaultPage(String wxAppId, String type) {
+        if (!StringUtils.isEmpty(wxAppId) && !StringUtils.isEmpty(type)) {
+            String hashKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_" + wxAppId;
+            Object value = this.redisCache.hashGet(hashKey, type);
+            return (List)(value != null ? JSONArray.parseArray(value.toString(), AssortmentOpenPlatformPartnerWxappConfig.class) : new ArrayList());
+        } else {
+            return new ArrayList();
+        }
+    }
+
 }