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

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

@@ -1317,7 +1317,7 @@ public class OrderServiceImpl implements Orderservice {
         QueryOrderResponseVo queryOrderResponseVo = queryOrderResponseVos.get(0);
 
         //麦咖啡 预约外卖单重新封装取餐时间
-        if (OrderType.TAKE_OUT.getCode().equals(queryOrderResponseVo.getOrderType()) && queryOrderResponseVo.getTakeMealType() == 1 &&  StringUtils.isNotEmpty(queryOrderResponseVo.getReserveDeliveryTime())) {
+        if (OrderType.TAKE_OUT.getCode().equals(queryOrderResponseVo.getOrderType()) && StringUtils.isNotEmpty(queryOrderResponseVo.getReserveDeliveryTime())) {
             Date reserveDeliveryTime = DateUtil.convert2Date(queryOrderResponseVo.getReserveDeliveryTime(), "yyyy-MM-dd HH:mm:ss");
             queryOrderResponseVo.setReserveDeliveryTime(formatSpecialDate(reserveDeliveryTime));
         }

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

@@ -58,29 +58,27 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
         saasOrderHandle.orderConfirm(orderManagerRequest, orderBean);
 
         //支付成功已经 创建配送单
-        if (!Objects.equals(orderBean.getOrderType(), OrderType.TAKE_OUT.getCode())) {
-            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 (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);
+            }
 
-                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(new Date()));
-                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);
-                }
+            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(new Date()));
+            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);
             }
-            // 异步核销券码
-            couponHandle.asyncVerificationCoupon(orderBean);
         }
+        // 异步核销券码
+        couponHandle.asyncVerificationCoupon(orderBean);
         return ResponseUtil.success();
     }