Merge remote-tracking branch 'origin/master'

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

@@ -65,6 +65,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);
@@ -72,22 +76,21 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
                 return ResponseUtil.error(ResponseResult.ORDER_UPDATE_PICKUP_FAILED);
             }
 
-            SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-            DeliveryOrderAssemblyackRequest assemblyAckRequest =new DeliveryOrderAssemblyackRequest();
-            assemblyAckRequest.setOrderKey(request.getOrderId());
-            assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo());
-            assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(DateUtil.addHours(new Date(), -8)));
-            assemblyAckRequest.setStoreId(orderBean.getShopId());
-            //入机成功通知配送
-            DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
-            if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode()+"")) {
-                return ResponseUtil.error(ResponseResult.DELIVERY_ASSEMBLY_ACK_ERROR);
+            if (Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+                DeliveryOrderAssemblyackRequest assemblyAckRequest = new DeliveryOrderAssemblyackRequest();
+                assemblyAckRequest.setOrderKey(request.getOrderId());
+                assemblyAckRequest.setDisplayOrderNumber(request.getPickUpGoodsNo());
+                assemblyAckRequest.setAssemblyTimeUTC(dateFormat.format(DateUtil.addHours(new Date(), -8)));
+                assemblyAckRequest.setStoreId(orderBean.getShopId());
+                //入机成功通知配送
+                DeliveryResponseDto deliveryResponse = deliveryMCCafeClient.assemblyAck(assemblyAckRequest);
+                if (deliveryResponse == null || !StringUtils.equals(ResponseResult.SUCCESS.getCode(), deliveryResponse.getCode() + "")) {
+                    return ResponseUtil.error(ResponseResult.DELIVERY_ASSEMBLY_ACK_ERROR);
+                }
             }
         }
-        if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
-            // 异步核销券码
-            couponHandle.asyncVerificationCoupon(orderBean);
-        }
+
         return ResponseUtil.success();
     }