Merge branches 'develop' and 'feature/20200604_预约单任务删除_wuping' of…

Merge branches 'develop' and 'feature/20200604_预约单任务删除_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.9.1-SNAPSHOT</version>
+    <version>1.9.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -101,4 +101,5 @@
 | 1.5.6-RELEASE| 更新客如云方法名 | 海波 | 2020-06-05 |
 | 1.8.9-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
 | 1.8.10-SNAPSHOT | 集点为0时不调用会员接口 | 梁崇福 | 2020-06-01 |
-| 1.9.1-SNAPSHOT | 修改客如云接口名 | 海波 | 2020-06-05 |
\ No newline at end of file
+| 1.9.1-SNAPSHOT | 修改客如云接口名 | 海波 | 2020-06-05 |
+| 1.9.2-SNAPSHOT| 预约单任务删除  | wuping | 2020-06-05 |
\ No newline at end of file

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

@@ -245,7 +245,6 @@ public class OrderSdkAdapter {
         request.setDeliveryContactInfoList(deliveryContactInfoList);
         //保存门店渠道信息
         request.setOrderExtended(requestVO.getOrderExtended());
-        request.setOrderTask(requestVO.getOrderTask());
         request.setOperator(requestVO.getOperator());
         request.setAppId(requestVO.getAppId());
 
@@ -350,7 +349,6 @@ public class OrderSdkAdapter {
         createOrderRequest.setDeliveryContactInfoList(deliveryContactInfoList);
         //门店渠道信息
         createOrderRequest.setOrderExtended(orderInfo.getOrderExtended());
-        createOrderRequest.setOrderTask(orderInfo.getOrderTask());
         return createOrderRequest;
     }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -130,8 +130,6 @@ public class BaseCreateOrderRequest extends BaseConfig {
 
     private OrderExtendedReq orderExtended;
 
-    //预订单任务
-    private OrderTaskReq orderTask;
     //操作人
     private String operator;
     /**

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

@@ -438,18 +438,6 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     && StringUtils.isNotBlank(configuration.getOverTimeCloseOrderTime())){
                 timeout =  Integer.parseInt(configuration.getOverTimeCloseOrderTime());
             }
-            //设置预约单支付成功超时任务
-            if(StringUtils.isNotBlank(confirmOrderRequest.getExpectTime())  && timeout != 0){
-                OrderTaskReq orderTask = new OrderTaskReq();
-                orderTask.setTaskType(2);
-                orderTask.setProcessingTime(confirmOrderRequest.getExpectTime());
-                Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(confirmOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), timeout);
-                orderTask.setTaskTime(DateUtil.convert2String(processingDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
-                orderTask.setTimeout(timeout);
-                request.setOrderTask(orderTask);
-                //设置超时拒单时间为0
-                timeout = 0;
-            }
             //isAutoTakeOrder = 3为服务端超时接单
             if("3".equals(storeResponse.getBizVO().getIsAutoTakeOrder())){
                 //外卖订单
@@ -1430,13 +1418,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     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.setRemindTime(getMinTime(orderWarnTime));
         }
         request.setTimeout(timeout);
     }

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.8.10-SNAPSHOT</version>
+            <version>1.9.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -117,18 +117,6 @@ 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);
-        }
         ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
         long deliveryAmount = 0;
         long discountDeliveryAmount = 0;
@@ -268,18 +256,6 @@ 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);
-        }
         CreateFatherSonOrderRequest.OrderInfo memberOrderInfo = convertMemberOrderInfo(createOrderVo, shoppingCartGoodsDto, productOrderInfo.getOrderType());
         CreateFatherSonOrderRequest.OrderInfo fatherOrderInfo = convertFatherOrderInfo(createOrderVo, shoppingCartGoodsDto, deliveryInfoDto, productOrderInfo.getOrderType());
 
@@ -2668,46 +2644,6 @@ 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 CreatePrepayRequestDto convertToCreatePrepayRequestDto(String partnerId, String wxAppId, String openId,
              String faceCode, String cardCode, String payCode, QueryOrdersResponse.DataBean.OrderBean fatherOrderBean,
              QueryOrdersResponse.DataBean.OrderBean productOrderBean, long totalAmount, int cardAmount, OrderExtInfoDto orderExtInfoDTO,

order-management/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.8.10-SNAPSHOT</version>
+            <version>1.9.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

ordercenter-sdk/readme.md

@@ -33,4 +33,5 @@
 | 1.3.1.RELEASE | 增加下游订单号 | 海波 | 2020-06-01 |
 | 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 |
 | 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
-| 1.4.14-SNAPSHOT | 增加非码微店类型 | 梁崇福 | 2020-06-05 |
\ No newline at end of file
+| 1.4.14-SNAPSHOT | 增加非码微店类型 | 梁崇福 | 2020-06-05 |
+| 1.4.15-SNAPSHOT | 预约单任务删除 | wuping | 2020-06-05 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/POSOrderOperationBaseReq.java

@@ -12,7 +12,6 @@
  */
 package com.freemud.application.sdk.api.ordercenter.request;
 
-import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import lombok.Data;
 
 @Data
@@ -25,7 +24,7 @@ public class POSOrderOperationBaseReq {
     //从接单、制作完成、送出开始计时，超时的时间（单位：分钟）
     private Integer timeout;
 
-    //预约单任务（处理提醒时拉单的）接单接口时传
-    private OrderTaskReq orderTask;
+    //预约单接单提醒时间 提醒触发时间=预约时间-提醒时间
+    private Integer remindTime;
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java

@@ -205,9 +205,6 @@ public class CreateOrderRequest extends BaseRequest {
     //订单扩展信息 （门店渠道信息）
     private OrderExtendedReq orderExtended;
 
-    //预订单任务
-    private OrderTaskReq orderTask;
-
     //操作人
     private String operator;