Merge remote-tracking branch 'origin/qa' into qa

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

@@ -68,6 +68,10 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
             // 订单接单
             saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
         }
+        if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
+            // 异步核销券码
+            couponHandle.asyncVerificationCoupon(orderBean);
+        }
         if (StringUtils.isNotEmpty(request.getPickUpGoodsNo())){
             //更新取餐码
             BaseResponse baseResponse = saasOrderHandle.updatePickUpGoodNo(request, orderBean);
@@ -91,10 +95,7 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
                 }
             }
         }
-        if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
-            // 异步核销券码
-            couponHandle.asyncVerificationCoupon(orderBean);
-        }
+
         return ResponseUtil.success();
     }