发更新取餐码提前

order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java

@@ -80,6 +80,13 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
         if (!OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus()) && !OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())){
             return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
         }
+        if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
+            //更新取餐码
+            BaseResponse baseResponse = saasOrderHandle.updatePickUpGoodNo(request, orderBean);
+            if (!ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())){
+                return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED);
+            }
+        }
         if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
             // 订单接单
             saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
@@ -89,11 +96,6 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
             couponHandle.asyncVerificationCoupon(orderBean);
         }
         if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
-            //更新取餐码
-            BaseResponse baseResponse = saasOrderHandle.updatePickUpGoodNo(request, orderBean);
-            if (!ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode())){
-                return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED);
-            }
 
             if (Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
                 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");