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

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

@@ -447,16 +447,6 @@ public class OrderServiceImpl implements Orderservice {
             //orderRefund(orderBean, "订单异常退款", openid, oid);
             return gson.toJson(message);
         }
-        //更新取餐码
-        String pickUpGoodNo = orderAdapter.generateTackCode(orderBean.getCompanyId(), orderBean.getShopId());
-        BaseResponse baseResponse = updatePickUpGoodNo(pickUpGoodNo,orderBean,wxappid);
-        log.info("===="+baseResponse.getCode());
-        if(baseResponse.getCode().equalsIgnoreCase(ResponseResult.SUCCESS.getCode())){
-            payAccessResponse.getData().setTakeCode(pickUpGoodNo);
-        }
-        log.info("====payAccessResponse.getData().getTakeCode():"+payAccessResponse.getData().getTakeCode());
-        // TODO 订单序号替换取餐码显示
-        takeCode = payAccessResponse.getData().getTakeCode();
         daySeq = payAccessResponse.getData().getDaySeq();
         QueryByCodeResponse queryByCodeResponse33 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
         log.info("queryByCodeResponse33.getResult():{}",queryByCodeResponse33.getResult());
@@ -469,6 +459,15 @@ public class OrderServiceImpl implements Orderservice {
         newShoppingCartClearDto.setSessionId(sessionId);
         newShoppingCartClearDto.setOperationType(1);
         shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
+        //更新取餐码
+        String pickUpGoodNo = orderAdapter.generateTackCode(orderBean.getCompanyId(), orderBean.getShopId());
+        BaseResponse baseResponse = updatePickUpGoodNo(pickUpGoodNo,orderBean,wxappid);
+        if(baseResponse.getCode().equalsIgnoreCase(ResponseResult.SUCCESS.getCode())){
+            payAccessResponse.getData().setTakeCode(pickUpGoodNo);
+        }
+        log.info("====payAccessResponse.getData().getTakeCode():"+payAccessResponse.getData().getTakeCode());
+        // TODO 订单序号替换取餐码显示
+        takeCode = payAccessResponse.getData().getTakeCode();
         QueryByCodeResponse queryByCodeResponse44 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
         log.info("queryByCodeResponse44.getResult():{}",queryByCodeResponse44.getResult());
         if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {