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,7 +58,6 @@ 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);
@@ -80,7 +79,6 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
         }
         // 异步核销券码
         couponHandle.asyncVerificationCoupon(orderBean);
-        }
         return ResponseUtil.success();
     }