订单创建时初始化发起人餐位以及门店拼单客户列表，拼单取消时添加清除操作

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/CollageOrderConstant.java

+package com.freemud.sdk.api.assortment.shoppingcart.constant;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0.0
+ * @Description:
+ * @author: hui.miao
+ * @date: 2020-10-09 10:49
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+public class CollageOrderConstant {
+    public final static String COLLAGE_ORDER_FAILED = "订单操作失败";
+    public final static String COLLAGE_ORDER_NOT_EXIST = "拼单订单信息不存在";
+    public final static String COLLAGE_ORDER_ALREADY_EXIST = "当前用户存在进行中的拼单订单";
+}

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ShoppingCartConstant.java

@@ -33,7 +33,5 @@ public class ShoppingCartConstant {
     public final static String ONE_TRADE_CAN_ONLY_USE_ONE_GOODS_COUPON = "一笔交易仅允许同时使用一张商品券";
     public final static String ORDER_WAY_CHANGE = "切换点餐方式，商品库存和价格等可能会发生变化。";
 
-    public final static String COLLAGE_ORDER_NOT_EXIST = "拼单订单信息不存在";
-    public final static String COLLAGE_ORDER_ALREADY_EXIST = "当前用户存在进行中的拼单订单";
 }
 

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CollageOrderDto.java

 package com.freemud.sdk.api.assortment.shoppingcart.domain;
 
-import com.freemud.sdk.api.assortment.shoppingcart.constant.CollageLockStatus;
 import lombok.Builder;
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 /**

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/util/DateTimeUtils.java

@@ -245,4 +245,19 @@ public class DateTimeUtils {
         return getCurrentLocalDate().plus(2, ChronoUnit.DECADES).format(DATE_FORMATTER);
     }
 
+    /**
+     * 获取当前系统时间毫秒数
+     * @return
+     */
+    public static Long currentTimeMillis() {
+        return currentTimeMillis(0L);
+    }
+
+    /**
+     * 获取当前系统时间毫秒数加偏移量（秒）
+     * @return
+     */
+    public static Long currentTimeMillis(Long offset) {
+        return System.currentTimeMillis() + offset * 1000;
+    }
 }

shopping-cart-application-service/src/main/java/cn/freemud/controller/CollageOrderController.java

@@ -40,14 +40,14 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class CollageOrderController {
     @Autowired
-    private CollageOrderServiceImpl collageOrderServicel;
+    private CollageOrderServiceImpl collageOrderService;
 
     @ApiOperation(value = "查询拼单订单", notes = "根据商户ID、门店ID、拼单邀请人用户ID或者当前登录用户sessionId查询拼单订单信息")
     @ApiImplicitParam(value = "请求", required = true, dataType = "CollageOrderRequestVo", name = "CollageOrderRequestVo")
     @ApiAnnotation(logMessage = "getOrder")
     @PostMapping(value = "/getOrder")
     public BaseResponse queryCollageOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
-        return collageOrderServicel.queryCollageOrder(request);
+        return collageOrderService.queryCollageOrder(request);
     }
 
     @ApiOperation(value = "创建拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId创建拼单订单信息")
@@ -55,7 +55,7 @@ public class CollageOrderController {
     @ApiAnnotation(logMessage = "createOrder")
     @PostMapping(value = "/createOrder")
     public BaseResponse createOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
-        return collageOrderServicel.createCollageOrder(request);
+        return collageOrderService.createCollageOrder(request);
     }
 
     @ApiOperation(value = "取消拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId取消拼单订单，并删除相关拼单信息")
@@ -63,7 +63,7 @@ public class CollageOrderController {
     @ApiAnnotation(logMessage = "cancelOrder")
     @PostMapping(value = "/cancelOrder")
     public BaseResponse cancelCollageOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
-        return collageOrderServicel.cancelCollageOrder(request);
+        return collageOrderService.cancelCollageOrder(request);
     }
 
     @ApiOperation(value = "锁定拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId锁定拼单订单")
@@ -71,7 +71,7 @@ public class CollageOrderController {
     @ApiAnnotation(logMessage = "lockOrder")
     @PostMapping(value = "/lockOrder")
     public BaseResponse lockCollageOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
-        return collageOrderServicel.lockCollageOrder(request);
+        return collageOrderService.lockCollageOrder(request);
     }
 
     @ApiOperation(value = "解锁拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId解锁拼单订单")
@@ -79,7 +79,7 @@ public class CollageOrderController {
     @ApiAnnotation(logMessage = "unlockOrder")
     @PostMapping(value = "/unlockOrder")
     public BaseResponse unlockCollageOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
-        return collageOrderServicel.unlockCollageOrder(request);
+        return collageOrderService.unlockCollageOrder(request);
     }
 
     @ApiOperation(value = "加入拼单订单", notes = "加入拼单订单")
@@ -87,7 +87,7 @@ public class CollageOrderController {
     @ApiAnnotation(logMessage = "addOrder")
     @PostMapping(value = "/addOrder")
     public BaseResponse addOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
-        return collageOrderServicel.addCollageOrder(request);
+        return collageOrderService.addCollageOrder(request);
     }
 
     @ApiOperation(value = "退出拼单订单", notes = "退出拼单订单")
@@ -95,6 +95,6 @@ public class CollageOrderController {
     @ApiAnnotation(logMessage = "outOfOrder")
     @PostMapping(value = "/outOfOrder")
     public BaseResponse outOfOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
-        return collageOrderServicel.outOfOrder(request);
+        return collageOrderService.outOfOrder(request);
     }
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java

@@ -84,6 +84,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
         // 根据sessionId查询对应登录用户信息
         collageOrderDto.setCreateCollageUserId(this.getUserIdBySessionId(request.getSessionId()));
+        collageOrderDto.setCurrentUserId(collageOrderDto.getCreateCollageUserId());
 
         // 创建拼单订单基础缓存信息
         BaseResponse<CollageOrder> createCollageOrderResponse = this.collageOrderBaseService.createCollageOrder(collageOrderDto);