会员卡订单保存预约任务

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

@@ -229,6 +229,7 @@ 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/CreateFatherSonOrderRequest.java

 package com.freemud.sdk.api.assortment.order.request.order;
 
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.sdk.api.assortment.order.config.BaseConfig;
@@ -149,5 +150,8 @@ public class CreateFatherSonOrderRequest extends BaseConfig {
 
         //订单扩展信息 （门店渠道信息）
         private OrderExtendedReq orderExtended;
+
+        //预订单任务
+        private OrderTaskReq orderTask;
     }
 }

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

@@ -246,13 +246,13 @@ public class OrderAdapter {
         return createOrderDto;
     }
 
-    public CreateFatherSonOrderRequest convertFatherSonOrderRequest(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto, OrderExtendedReq orderExtendedReq) {
+    public CreateFatherSonOrderRequest convertFatherSonOrderRequest(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto, OrderExtendedReq orderExtendedReq,String orderWarnTime) {
         CreateFatherSonOrderRequest createFatherSonOrderRequest = new CreateFatherSonOrderRequest();
         createFatherSonOrderRequest.setPartnerId(createOrderVo.getPartnerId());
         createFatherSonOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
         UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
         List<CreateFatherSonOrderRequest.OrderInfo> orderInfoList = new ArrayList<>();
-        CreateFatherSonOrderRequest.OrderInfo productOrderInfo = convertProductOrderInfo(createOrderVo, deliveryInfoDto, shoppingCartGoodsDto);
+        CreateFatherSonOrderRequest.OrderInfo productOrderInfo = convertProductOrderInfo(createOrderVo, deliveryInfoDto, shoppingCartGoodsDto,orderWarnTime);
         productOrderInfo.setOrderExtended(orderExtendedReq);
         CreateFatherSonOrderRequest.OrderInfo memberOrderInfo = convertMemberOrderInfo(createOrderVo, shoppingCartGoodsDto, productOrderInfo.getOrderType());
         CreateFatherSonOrderRequest.OrderInfo fatherOrderInfo = convertFatherOrderInfo(createOrderVo, shoppingCartGoodsDto, deliveryInfoDto, productOrderInfo.getOrderType());
@@ -504,7 +504,7 @@ public class OrderAdapter {
     }
 
     public CreateFatherSonOrderRequest.OrderInfo convertProductOrderInfo(CreateOrderVo createOrderVo
-            , UserDeliveryInfoDto userDeliveryInfoDto, ShoppingCartGoodsDto shoppingCartGoodsDto) {
+            , UserDeliveryInfoDto userDeliveryInfoDto, ShoppingCartGoodsDto shoppingCartGoodsDto,String orderWarnTime) {
         String deliveryType = userDeliveryInfoDto != null && userDeliveryInfoDto.getStoreDeliveryInfoDto() != null
                 ? userDeliveryInfoDto.getStoreDeliveryInfoDto().getDeliveryType() : "";
         QueryOrderType orderType;
@@ -522,18 +522,19 @@ public class OrderAdapter {
             throw new ServiceException(ResponseResult.PARAMETER_MISSING, "非法的订单类型");
         }
 
+
         String latitude = userDeliveryInfoDto != null ? userDeliveryInfoDto.getUserLatitude() : "";
         String longitude = userDeliveryInfoDto != null ? userDeliveryInfoDto.getUserLongitude() : "";
         String remark = StringUtils.isNotBlank(createOrderVo.getOrderRemark()) ? createOrderVo.getOrderRemark() : "";
         StringBuffer takeMealTime = new StringBuffer("");
+        CreateFatherSonOrderRequest.OrderInfo productOrderInfo = new CreateFatherSonOrderRequest.OrderInfo();
         Date takeMealDate = null;
         if (StringUtils.isNotBlank(createOrderVo.getTakeMealTime())) {
             takeMealTime = takeMealTime.append(DateUtil.convert2String(new Date(), "yyyy-MM-dd"))
                     .append(" ").append(createOrderVo.getTakeMealTime()).append(":00");
             takeMealDate = DateUtil.convert2Date(takeMealTime.toString(), "yyyy-MM-dd HH:mm:ss");
+            productOrderInfo.setOrderTask(saveOrderTaskReq(orderWarnTime,takeMealDate.getTime()));
         }
-
-        CreateFatherSonOrderRequest.OrderInfo productOrderInfo = new CreateFatherSonOrderRequest.OrderInfo();
         productOrderInfo.setPartnerId(createOrderVo.getPartnerId());
         productOrderInfo.setShopId(createOrderVo.getShopId());
         productOrderInfo.setShopName(createOrderVo.getStoreName());
@@ -561,7 +562,10 @@ public class OrderAdapter {
         productOrderInfo.setAmount(0L);
         productOrderInfo.setBarCounter(createOrderVo.getTableNumber());
         productOrderInfo.setOrderClient(OrderClientType.SAAS.getIndex());
-
+        if (StringUtils.isNotBlank(createOrderVo.getTakeMealTime())) {
+            takeMealTime = takeMealTime.append(DateUtil.convert2String(new Date(), "yyyy-MM-dd"))
+                    .append(" ").append(createOrderVo.getTakeMealTime()).append(":00");
+        }
         long deliveryAmount = 0;
         if (userDeliveryInfoDto != null) {
             deliveryAmount = getUserRealDeliveryAmount(userDeliveryInfoDto.getStoreDeliveryInfoDto(), userDeliveryInfoDto.getUserLongitude(), userDeliveryInfoDto.getUserLatitude());

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

@@ -1695,7 +1695,7 @@ public class OrderServiceImpl implements Orderservice {
         });
         //创建父子订单
         Function<Object, CreateFatherSonOrderResponse> createFatherSonOrder = (var -> {
-            CreateFatherSonOrderRequest createFatherSonOrderRequest = orderAdapter.convertFatherSonOrderRequest(createOrderVo, shoppingCartGoodsDto, orderExtendedReq);
+            CreateFatherSonOrderRequest createFatherSonOrderRequest = orderAdapter.convertFatherSonOrderRequest(createOrderVo, shoppingCartGoodsDto, orderExtendedReq,orderWarnTime);
             //查询第三方商品编号
             createFatherSonOrderRequest = getProductCustomerCodeNew(createFatherSonOrderRequest);
             MqMessageRequest mqMessageRequest = new MqMessageRequest();