Commit 4338b23d by zhiheng.zhang

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

parents 19a744de 91cbd893
...@@ -2989,9 +2989,11 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2989,9 +2989,11 @@ public class OrderServiceImpl implements Orderservice {
List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = orderAdapter.cacheSelectDefaultPage(appId, "2"); List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = orderAdapter.cacheSelectDefaultPage(appId, "2");
Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity())); Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get("mealCodeRule"); AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get("mealCodeRule");
log.info("partnerWxappConfigs:{}", JsonUtil.toJSONString(partnerWxappConfigs)); log.info("orderBean,partnerWxappConfigs:{},{}",orderBean.getOid(),JsonUtil.toJSONString(partnerWxappConfigs));
if(null != refundDeliveryFeeConfig) { if(null != refundDeliveryFeeConfig) {
log.info("orderBean.getOid(),refundDeliveryFeeConfig:{},{}",orderBean.getOid(),refundDeliveryFeeConfig);
String mealCodeRule = refundDeliveryFeeConfig.getAppValue(); String mealCodeRule = refundDeliveryFeeConfig.getAppValue();
log.info("orderBean.getOid(),mealCodeRule:{},{}",orderBean.getOid(),mealCodeRule);
if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) { if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) {
//更新db中的取餐码,生成取餐码 //更新db中的取餐码,生成取餐码
OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq(); OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment