清除拼单订单缓存接口提交

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/CollageOrderBaseService.java

@@ -33,11 +33,11 @@ public interface CollageOrderBaseService {
     BaseResponse<CollageOrder> createCollageOrder(CollageOrderDto collageOrderDto);
 
     /**
-     * 取消拼单订单
+     * 清除拼单订单Redis缓存
      * @param collageOrderDto
      * @return
      */
-    BaseResponse cancelCollageOrder(CollageOrderDto collageOrderDto);
+    BaseResponse clearCollageOrder(CollageOrderDto collageOrderDto);
 
     /**
      * 锁定拼单订单

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageOrderBaseServiceImpl.java

@@ -115,18 +115,18 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
     }
 
     /**
-     * 取消拼单订单
+     * 清除拼单缓存
      * @param collageOrderDto
      * @return
      */
     @Override
-    public BaseResponse cancelCollageOrder(CollageOrderDto collageOrderDto) {
+    public BaseResponse clearCollageOrder(CollageOrderDto collageOrderDto) {
         try {
             // 批量删除上述Key对应的Redis缓存
             this.deleteCollageBaseHash(this.collageOrderSdkAdapter.toCollageOrder(collageOrderDto));
             return CartResponseUtil.success();
         } catch (Exception e) {
-            ErrorLog.printErrorLog("取消拼单订单异常", "CollageOrderBaseServiceImpl/cancelCollageOrder", this.collageOrderRequest(collageOrderDto),  e);
+            ErrorLog.printErrorLog("清除拼单订单异常", "CollageOrderBaseServiceImpl/clearCollageOrder", this.collageOrderRequest(collageOrderDto),  e);
             return CartResponseUtil.error(CollageOrderConstant.COLLAGE_ORDER_FAILED);
         }
     }

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

@@ -66,6 +66,14 @@ public class CollageOrderController {
         return collageOrderService.cancelCollageOrder(request);
     }
 
+    @ApiOperation(value = "清除拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId删除相关拼单信息")
+    @ApiImplicitParam(value = "请求", required = true, dataType = "CollageOrderRequestVo", name = "CollageOrderRequestVo")
+    @ApiAnnotation(logMessage = "clearOrder")
+    @PostMapping(value = "/clearOrder")
+    public BaseResponse clearCollageOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
+        return collageOrderService.clearCollageOrder(request);
+    }
+
     @ApiOperation(value = "锁定拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId锁定拼单订单")
     @ApiImplicitParam(value = "请求", required = true, dataType = "CollageOrderRequestVo", name = "CollageOrderRequestVo")
     @ApiAnnotation(logMessage = "lockOrder")

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

@@ -38,6 +38,13 @@ public interface CollageOrderService {
     BaseResponse cancelCollageOrder(CollageOrderRequestVo request);
 
     /**
+     * 清除拼单订单
+     * @param request
+     * @return
+     */
+    BaseResponse clearCollageOrder(CollageOrderRequestVo request);
+
+    /**
      * 锁定拼单订单
      * @param request
      * @return

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

@@ -113,7 +113,21 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         // 根据sessionId查询对应登录用户信息
         collageOrderDto.setCreateCollageUserId(this.getUserIdBySessionId(request.getSessionId()));
         this.checkCollageOrderOwner(collageOrderDto);
-        return this.collageOrderBaseService.cancelCollageOrder(collageOrderDto);
+        return this.collageOrderBaseService.clearCollageOrder(collageOrderDto);
+    }
+
+    /**
+     * 删除拼单相关缓存信息
+     * @param request
+     * @return
+     */
+    @Override
+    public BaseResponse clearCollageOrder(CollageOrderRequestVo request) {
+        CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
+        // 根据sessionId查询对应登录用户信息
+        collageOrderDto.setCreateCollageUserId(this.getUserIdBySessionId(request.getSessionId()));
+        this.checkCollageOrderOwner(collageOrderDto);
+        return this.collageOrderBaseService.clearCollageOrder(collageOrderDto);
     }
 
     /**

shopping-cart-application-service/src/test/java/cn.freemud/service/CollageOrderBaseServiceTest.java

@@ -56,13 +56,13 @@ public class CollageOrderBaseServiceTest {
     }
 
     @Test
-    public void cancelCollageOrder() {
+    public void clearCollageOrder() {
         CollageOrderDto collageOrderDto = CollageOrderDto.builder()
                 .createCollageUserId("user1")
                 .partnerId("partner1")
                 .storeId("store1")
                 .build();
-        BaseResponse response = collageOrderBaseService.cancelCollageOrder(collageOrderDto);
-        log.debug("cancelCollageOrder return: {}", response.getResult());
+        BaseResponse response = collageOrderBaseService.clearCollageOrder(collageOrderDto);
+        log.debug("clearCollageOrder return: {}", response.getResult());
     }
 }