Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of…

Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

assortment-ordercenter-sdk/readme.md

@@ -71,3 +71,4 @@
 | 1.7.4-SNAPSHOT| 客如云 | 海波 | 2020-05-15 |
 | 1.7.6-SNAPSHOT| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-15 |
 | 1.7.7-SNAPSHOT| 聚合订单综合查询新增新订单类型  | wuping | 2020-05-15 |
+| 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提  | wuping | 2020-05-18 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -61,7 +61,8 @@ public class OrderSdkAdapter {
         orderRequest.setShopId(orderBean.getShopId());
         orderRequest.setHasSelfDelivery(true);
         orderRequest.setPartnerId(orderBean.getCompanyId());
-        orderRequest.setOrderType(getNewOrderTypeEnum(orderBean.getType(), orderBean.getGmtExpect()));
+//        orderRequest.setOrderType(getNewOrderTypeEnum(orderBean.getType(), orderBean.getGmtExpect()));
+        orderRequest.setOrderType(OrderType.getOrderType(orderBean.getNewOrderType()));
         if(orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0){
             orderRequest.setExpectTime(cn.freemud.base.util.DateUtil.convert2String(new Date(orderBean.getGmtExpect()), cn.freemud.base.util.DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         }
@@ -76,15 +77,15 @@ public class OrderSdkAdapter {
      * @param orderBean
      * @return
      */
-    public BaseQueryOrderRequest getOrderDeliveryRequest(String operator, QueryOrdersResponse.DataBean.OrderBean orderBean){
-        BaseQueryOrderRequest orderDeliveryRequest = getOrderConfirmRequest(operator, orderBean);
-        if (orderBean.getType() == 1) {
-            orderDeliveryRequest.setOrderType(com.freemud.application.sdk.api.ordercenter.enums.OrderType.GENERAL_EXPRESS);
-        } else {
-            orderDeliveryRequest.setOrderType(com.freemud.application.sdk.api.ordercenter.enums.OrderType.GENERAL_SELF_PICKUP);
-        }
-        return orderDeliveryRequest;
-    }
+//    public BaseQueryOrderRequest getOrderDeliveryRequest(String operator, QueryOrdersResponse.DataBean.OrderBean orderBean){
+//        BaseQueryOrderRequest orderDeliveryRequest = getOrderConfirmRequest(operator, orderBean);
+//        if (orderBean.getType() == 1) {
+//            orderDeliveryRequest.setOrderType(com.freemud.application.sdk.api.ordercenter.enums.OrderType.GENERAL_EXPRESS);
+//        } else {
+//            orderDeliveryRequest.setOrderType(com.freemud.application.sdk.api.ordercenter.enums.OrderType.GENERAL_SELF_PICKUP);
+//        }
+//        return orderDeliveryRequest;
+//    }
 
     /**
      * 拒单request

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -1402,33 +1402,40 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     timeout = AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime());
                 }
                 //预约单
-                if(StringUtils.isNotEmpty(baseQueryOrderRequest.getExpectTime())
+                if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())
                         && StringUtils.isNotEmpty(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime())){
                     timeout = AutoOrderConfigTime.getTime(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime());
                 }
-            } else {//自提单
+            } else {//自提、堂食单
                 if (StringUtils.isNotEmpty(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime())) {
                     timeout = AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime());
                 }
-                //预约单
-                if(StringUtils.isNotEmpty(baseQueryOrderRequest.getExpectTime())
+                //自提、堂食预约单
+                if((OrderType.RESERVED_DINE_IN.equals(baseQueryOrderRequest.getOrderType()) || OrderType.RESERVED_SELF_PICKUP.equals(baseQueryOrderRequest.getOrderType()))
                         && StringUtils.isNotEmpty(configuration.getAppointAutoSelfmentionTakeOrderWorkflowFinishTime())){
                     timeout = AutoOrderConfigTime.getTime(configuration.getAppointAutoSelfmentionTakeOrderWorkflowFinishTime());
                 }
             }
-            //预约单提醒任务，触发放拉单队列
-            if(StringUtils.isNotEmpty(baseQueryOrderRequest.getExpectTime())){
-                OrderTaskReq orderTask = new OrderTaskReq();
-                orderTask.setTaskType(3);
-                Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(baseQueryOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), -getMinTime(orderWarnTime));
-                orderTask.setProcessingTime(DateUtil.convert2String(processingDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
-                orderTask.setTaskTime(baseQueryOrderRequest.getExpectTime());
-//                orderTask.setTimeout(0);
-                request.setOrderTask(orderTask);
-            }
         } else {
             timeout = 120;
         }
+        //预约单提醒任务，触发放拉单队列
+        if (OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())
+                || OrderType.RESERVED_DINE_IN.equals(baseQueryOrderRequest.getOrderType())
+                || OrderType.RESERVED_SELF_PICKUP.equals(baseQueryOrderRequest.getOrderType())){
+            //外卖预约单
+            if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
+                    configuration != null && configuration.getDeliveryOrderWarnTime() != null){
+                orderWarnTime = configuration.getDeliveryOrderWarnTime();
+            }
+            OrderTaskReq orderTask = new OrderTaskReq();
+            orderTask.setTaskType(3);
+            Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(baseQueryOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), -getMinTime(orderWarnTime));
+            orderTask.setProcessingTime(DateUtil.convert2String(processingDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+            orderTask.setTaskTime(baseQueryOrderRequest.getExpectTime());
+//                orderTask.setTimeout(0);
+            request.setOrderTask(orderTask);
+        }
         request.setTimeout(timeout);
     }
 

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -83,7 +83,7 @@ public class SaasOrderHandle {
      * @return
      */
     public BaseResponse orderDelivery(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        BaseQueryOrderRequest orderDeliveryRequest = orderSdkAdapter.getOrderDeliveryRequest(request.getOperator(), orderBean);
+        BaseQueryOrderRequest orderDeliveryRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderSend(orderDeliveryRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             throw new OrderServiceException(ResponseResult.DELIVERY_FAIL);
@@ -99,7 +99,7 @@ public class SaasOrderHandle {
      * @return
      */
     public BaseResponse orderAffirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        BaseQueryOrderRequest orderAffirmRequest = orderSdkAdapter.getOrderDeliveryRequest(request.getOperator(), orderBean);
+        BaseQueryOrderRequest orderAffirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderAffirm(orderAffirmRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             throw new OrderServiceException(ResponseResult.AFFIRM_ORDER_FAIL);