下单新增预约时间字段修改，格式yyyy-MM-dd HH:mm:ss

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -117,18 +117,18 @@ public class OrderAdapter {
     public BaseCreateOrderRequest convent2CreateOrderDto(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto,StoreResponse.BizVO storeResponseDto) {
 //        UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
         BaseCreateOrderRequest createOrderDto = getCreateOrderDto(createOrderVo);
-        OrderTaskReq orderTask = null;
-        if(StringUtils.isNotEmpty(createOrderVo.getTakeMealTime())){
-            Integer orderType = 0;
-            if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
-                orderType = 1;
-            }
-            //预订单任务
-            orderTask = getOrderTaskReq(storeResponseDto,createOrderVo.getTakeMealTime(),orderType);
-        }
-        if(orderTask != null){
-            createOrderDto.setOrderTask(orderTask);
-        }
+//        OrderTaskReq orderTask = null;
+//        if(StringUtils.isNotEmpty(createOrderVo.getTakeMealTime())){
+//            Integer orderType = 0;
+//            if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
+//                orderType = 1;
+//            }
+//            //预订单任务
+//            orderTask = getOrderTaskReq(storeResponseDto,createOrderVo.getTakeMealTime(),orderType);
+//        }
+//        if(orderTask != null){
+//            createOrderDto.setOrderTask(orderTask);
+//        }
         ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
         long deliveryAmount = 0;
         long discountDeliveryAmount = 0;
@@ -269,18 +269,18 @@ public class OrderAdapter {
         CreateFatherSonOrderRequest.OrderInfo productOrderInfo = convertProductOrderInfo(createOrderVo, deliveryInfoDto, shoppingCartGoodsDto);
         productOrderInfo.setOrderExtended(orderExtendedReq);
         productOrderInfo.setAppId(appId);
-        OrderTaskReq orderTask = null;
-        if(StringUtils.isNotEmpty(createOrderVo.getTakeMealTime())){
-            Integer orderType = 0;
-            if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
-                orderType = 1;
-            }
-            //预订单任务
-            orderTask = getOrderTaskReq(storeResponseDto,createOrderVo.getTakeMealTime(),orderType);
-        }
-        if(orderTask != null){
-            productOrderInfo.setOrderTask(orderTask);
-        }
+//        OrderTaskReq orderTask = null;
+//        if(StringUtils.isNotEmpty(createOrderVo.getTakeMealTime())){
+//            Integer orderType = 0;
+//            if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
+//                orderType = 1;
+//            }
+//            //预订单任务
+//            orderTask = getOrderTaskReq(storeResponseDto,createOrderVo.getTakeMealTime(),orderType);
+//        }
+//        if(orderTask != null){
+//            productOrderInfo.setOrderTask(orderTask);
+//        }
         CreateFatherSonOrderRequest.OrderInfo memberOrderInfo = convertMemberOrderInfo(createOrderVo, shoppingCartGoodsDto, productOrderInfo.getOrderType());
         CreateFatherSonOrderRequest.OrderInfo fatherOrderInfo = convertFatherOrderInfo(createOrderVo, shoppingCartGoodsDto, deliveryInfoDto, productOrderInfo.getOrderType());
 
@@ -514,7 +514,7 @@ public class OrderAdapter {
         createOrderDto.setSource(OrderSourceType.SAAS.getCode());
         createOrderDto.setSourceName(OrderSourceType.SAAS.getDesc());
         createOrderDto.setRemark(remark);
-        createOrderDto.setGmtExpect(StringUtils.isNotBlank(createOrderVo.getTakeMealTime()) ? DateUtil.convert2Date(createOrderVo.getTakeMealTime(),"yyyy-MM-dd HH:mm:ss").getTime() : null);
+        createOrderDto.setGmtExpect(StringUtils.isNotBlank(createOrderVo.getExpectTime()) ? DateUtil.convert2Date(createOrderVo.getExpectTime(),"yyyy-MM-dd HH:mm:ss").getTime() : null);
         BaseCreateOrderRequest.DeliveryTypeInfo deliveryTypeInfo = new BaseCreateOrderRequest.DeliveryTypeInfo();
         deliveryTypeInfo.setDeliveryType(QueryDeliveryType.getByCode(deliveryType));
         createOrderDto.setAddInfo(deliveryTypeInfo);
@@ -569,7 +569,7 @@ public class OrderAdapter {
         productOrderInfo.setSource(OrderSourceType.SAAS.getCode());
         productOrderInfo.setSourceName(OrderSourceType.SAAS.getDesc());
         productOrderInfo.setRemark(remark);
-        productOrderInfo.setGmtExpect(StringUtils.isNotBlank(createOrderVo.getTakeMealTime()) ? DateUtil.convert2Date(createOrderVo.getTakeMealTime(),"yyyy-MM-dd HH:mm:ss").getTime() : null);
+        productOrderInfo.setGmtExpect(StringUtils.isNotBlank(createOrderVo.getExpectTime()) ? DateUtil.convert2Date(createOrderVo.getExpectTime(),"yyyy-MM-dd HH:mm:ss").getTime() : null);
         BaseCreateOrderRequest.DeliveryTypeInfo deliveryTypeInfo = new BaseCreateOrderRequest.DeliveryTypeInfo();
         deliveryTypeInfo.setDeliveryType(QueryDeliveryType.getByCode(deliveryType));
         productOrderInfo.setAddInfo(deliveryTypeInfo);
@@ -2664,44 +2664,44 @@ public class OrderAdapter {
         return type;
     }
 
-    public OrderTaskReq getOrderTaskReq(StoreResponse.BizVO storeResponse,String expectTime,Integer orderType){
-        OrderTaskReq orderTask = new OrderTaskReq();
-        StoreResponse.Configuration configuration = storeResponse.getStoreConfig();
-        Integer timeout = 0;
-        if (configuration != null) {
-            //外卖单
-            if (OldOrderType.TAKE_OUT.getCode().equals(orderType)) {
-                if (StringUtils.isNotEmpty(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime())) {
-                    timeout = AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime());
-                }
-                //预约单
-                if(StringUtils.isNotEmpty(expectTime)
-                        && StringUtils.isNotEmpty(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime())){
-                    timeout = AutoOrderConfigTime.getTime(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime());
-                }
-            } else {//自提单
-                if (org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime())) {
-                    timeout = AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime());
-                }
-                //预约单
-                if(StringUtils.isNotEmpty(expectTime)
-                        && StringUtils.isNotEmpty(configuration.getAppointAutoSelfmentionTakeOrderWorkflowFinishTime())){
-                    timeout = AutoOrderConfigTime.getTime(configuration.getAppointAutoSelfmentionTakeOrderWorkflowFinishTime());
-                }
-            }
-        } else {
-            timeout = 120;
-        }
-        //预约单提醒任务，触发放拉单队列
-        if(StringUtils.isNotEmpty(expectTime) && timeout != null && timeout != 0){
-            orderTask.setTaskType(1);
-            Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(expectTime, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), timeout);
-            orderTask.setProcessingTime(expectTime);
-            orderTask.setTaskTime(DateUtil.convert2String(processingDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
-            orderTask.setTimeout(timeout);
-        }
-        return orderTask;
-    }
+//    public OrderTaskReq getOrderTaskReq(StoreResponse.BizVO storeResponse,String expectTime,Integer orderType){
+//        OrderTaskReq orderTask = new OrderTaskReq();
+//        StoreResponse.Configuration configuration = storeResponse.getStoreConfig();
+//        Integer timeout = 0;
+//        if (configuration != null) {
+//            //外卖单
+//            if (OldOrderType.TAKE_OUT.getCode().equals(orderType)) {
+//                if (StringUtils.isNotEmpty(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime())) {
+//                    timeout = AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime());
+//                }
+//                //预约单
+//                if(StringUtils.isNotEmpty(expectTime)
+//                        && StringUtils.isNotEmpty(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime())){
+//                    timeout = AutoOrderConfigTime.getTime(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime());
+//                }
+//            } else {//自提单
+//                if (org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime())) {
+//                    timeout = AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime());
+//                }
+//                //预约单
+//                if(StringUtils.isNotEmpty(expectTime)
+//                        && StringUtils.isNotEmpty(configuration.getAppointAutoSelfmentionTakeOrderWorkflowFinishTime())){
+//                    timeout = AutoOrderConfigTime.getTime(configuration.getAppointAutoSelfmentionTakeOrderWorkflowFinishTime());
+//                }
+//            }
+//        } else {
+//            timeout = 120;
+//        }
+//        //预约单提醒任务，触发放拉单队列
+//        if(StringUtils.isNotEmpty(expectTime) && timeout != null && timeout != 0){
+//            orderTask.setTaskType(1);
+//            Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(expectTime, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), timeout);
+//            orderTask.setProcessingTime(expectTime);
+//            orderTask.setTaskTime(DateUtil.convert2String(processingDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+//            orderTask.setTimeout(timeout);
+//        }
+//        return orderTask;
+//    }
 
 
     public CreatePrepayRequestDto convertToCreatePrepayRequestDto(String partnerId, String wxAppId, String openId,

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -97,6 +97,11 @@ public class CreateOrderVo {
     private String takeMealTime;
 
     /**
+     * 预约时间 格式yyyy-MM-dd HH:mm:ss
+     */
+    private String expectTime;
+
+    /**
      * 取餐标识 0=我已到店、尽快送出
      */
     private String takeMealFlag;

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

@@ -153,7 +153,7 @@ public class AppOrderServiceImpl implements AppOrderService {
             throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
         }
         // 查询门店信息 营业时间、营业状态，服务器当前时间在营业时间内 点餐桌号
-        checkOrder.checkOrderByStore(storeResponse.getBizVO(),createOrderReq.getTakeMealTime());
+        checkOrder.checkOrderByStore(storeResponse.getBizVO());
         // 查商品服务确定金额
         ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrderProduct(partnerId,shopId,createOrderReq.getOrderProducts(),
                 createOrderReq.getMenuType(),createOrderReq.getReachStoreType());

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

@@ -274,9 +274,7 @@ public class OrderServiceImpl implements Orderservice {
         // 查询购物车（内部校验券点餐方式，券是否可用） 校验当前订单类型的下单参数
         ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrder.getShoppingCartGoodsDto(createOrderVo);
         // 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
-        Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto,shoppingCartGoodsDto.getTotalAmount(), trackingNo);
-        //1.5.4版本，商品库存校验与扣库存
-        //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
+        Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto,1L, trackingNo);
         OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
 
         //1.9.2套餐需求同步优化创建订单代码

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

@@ -124,7 +124,7 @@ public class SellCouponOrderServiceImpl {
         }
         StoreResponse.BizVO storeResponseDto = storeResponse.getBizVO();
         // 查询门店信息 营业时间、营业状态，服务器当前时间在营业时间内 点餐桌号
-        checkOrder.checkOrderByStore(storeResponseDto,null);
+        checkOrder.checkOrderByStore(storeResponseDto);
 
         GetProductInfoRequest request = new GetProductInfoRequest();
         request.setChannel(requestVo.getMenuType());

order-application-service/src/test/java/cn.freemud/controller/OrderControllerTest.java

@@ -52,7 +52,7 @@ public class OrderControllerTest {
         request.setPartnerId("360bb48b-5316-458a-903e-9a44c7f339b1");
         request.setShopId("1036");
         request.setOrderType(1);
-        request.setTakeMealTime("12:00");
+//        request.setTakeMealTime("12:00");
         request.setTakeOut(0);
         request.setOrderRemark("不加香菜");
         String str = JSONObject.toJSONString(request);