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

@@ -328,8 +328,6 @@ 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);
     }
 
@@ -448,6 +446,8 @@ public class OrderServiceImpl implements Orderservice {
             //orderRefund(orderBean, "订单异常退款", openid, oid);
             return gson.toJson(message);
         }
+        //更新取餐码
+        updatePickUpGoodNo(orderBean,wxappid);
         // TODO 订单序号替换取餐码显示
         takeCode = payAccessResponse.getData().getTakeCode();
         daySeq = payAccessResponse.getData().getDaySeq();
@@ -2996,7 +2996,7 @@ public class OrderServiceImpl implements Orderservice {
                     return config;
                 }).getPartnerValue();
     }
-    public void updatePickUpGoodNo(CreatePrepayRequestDto createPrepayRequestDto,String appId){
+    public void updatePickUpGoodNo(OrderBean orderBean,String appId){
         try {
             List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = orderAdapter.cacheSelectDefaultPage(appId, "2");
             Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
@@ -3007,16 +3007,16 @@ public class OrderServiceImpl implements Orderservice {
                 if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) {
                     //更新db中的取餐码,生成取餐码
                     OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq();
-                    relatingCodeReq.setOrderCode(createPrepayRequestDto.getFatherOrderBean().getOid());
-                    relatingCodeReq.setOperator(createPrepayRequestDto.getFatherOrderBean().getCreateUser());
-                    relatingCodeReq.setPartnerId(createPrepayRequestDto.getPartnerId());
-                    relatingCodeReq.setPickUpGoodsNo(orderAdapter.generateTackCode(createPrepayRequestDto.getFatherOrderBean().getCompanyId(), createPrepayRequestDto.getFatherOrderBean().getShopId()));
+                    relatingCodeReq.setOrderCode(orderBean.getOid());
+                    relatingCodeReq.setOperator(orderBean.getCreateUser());
+                    relatingCodeReq.setPartnerId(orderBean.getCompanyId());
+                    relatingCodeReq.setPickUpGoodsNo(orderAdapter.generateTackCode(orderBean.getCompanyId(), orderBean.getShopId()));
                     log.info("====relatingCodeReq：{}", relatingCodeReq);
                     orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo());
                 }
             }
         }catch (Exception e){
-            log.error("===更新取餐码失败，createPrepayRequestDto,partnerWxappConfigs,appId：{},{},{}--->", e,JsonUtil.toJSONString(createPrepayRequestDto),appId);
+            log.error("===更新取餐码失败，createPrepayRequestDto,partnerWxappConfigs,appId：{},{},{}--->", e,JsonUtil.toJSONString(orderBean),appId);
         }
     }
 }