取餐码修改缓存中的key

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

@@ -21,6 +21,7 @@ import cn.freemud.amqp.MQService;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.log.LogTreadLocal;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.base.util.JsonUtil;
 import cn.freemud.constant.OrderRefundConstant;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
@@ -325,6 +326,8 @@ public class OrderServiceImpl implements Orderservice {
         CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto)createOrderOperateDtoResponse.getResult();
         //创建支付
         CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(userLoginInfoDto, createOrderVo, createOrderOperateDto, extInfo);
+        //更新取餐码
+        updatePickUpGoodNo(createPrepayRequestDto,userLoginInfoDto.getAppId());
         return this.createPrepayOrder(createPrepayRequestDto);
     }
 
@@ -442,20 +445,6 @@ public class OrderServiceImpl implements Orderservice {
             //orderRefund(orderBean, "订单异常退款", openid, oid);
             return gson.toJson(message);
         }
-        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();
-            relatingCodeReq.setOrderCode(orderBean.getOid());
-            relatingCodeReq.setOperator(orderBean.getCreateUser());
-            relatingCodeReq.setPartnerId(orderBean.getCompanyId());
-            relatingCodeReq.setPickUpGoodsNo(orderAdapter.generateTackCode(orderBean.getCompanyId(),orderBean.getShopId()));
-            orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo());
-        }
         // TODO 订单序号替换取餐码显示
         takeCode = payAccessResponse.getData().getTakeCode();
         daySeq = payAccessResponse.getData().getDaySeq();
@@ -2974,4 +2963,25 @@ public class OrderServiceImpl implements Orderservice {
         }
     }
 
+    public void updatePickUpGoodNo(CreatePrepayRequestDto createPrepayRequestDto,String appId){
+        try {
+            List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = this.cacheSelectDefaultPage(appId, "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("prefundDeliveryFeeConfig：mealCodeRule{},{}", refundDeliveryFeeConfig, mealCodeRule);
+            if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) {
+                //更新db中的取餐码,生成取餐码
+                OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq();
+                relatingCodeReq.setOrderCode(createPrepayRequestDto.getProductOrderBean().getOid());
+                relatingCodeReq.setOperator(createPrepayRequestDto.getProductOrderBean().getCreateUser());
+                relatingCodeReq.setPartnerId(createPrepayRequestDto.getProductOrderBean().getCompanyId());
+                relatingCodeReq.setPickUpGoodsNo(orderAdapter.generateTackCode(createPrepayRequestDto.getProductOrderBean().getCompanyId(), createPrepayRequestDto.getProductOrderBean().getShopId()));
+                log.info("====relatingCodeReq：{}",relatingCodeReq);
+                orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo());
+            }
+        }catch (Exception e){
+            log.error("===更新取餐码失败，createPrepayRequestDto，appId：{},{}--->", JsonUtil.toJSONString(createPrepayRequestDto),appId);
+        }
+    }
 }