【ID1010972】多人拼单 订单购物车代码分离结构调整

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/CollageOrderSdkAdapter.java

@@ -48,25 +48,12 @@ public class CollageOrderSdkAdapter {
                 .build();
     }
 
-    public CollageOrderDto toCollageOrderDto(CollageOrder collageOrder) {
-        return CollageOrderDto.builder()
-                .collageId(collageOrder.getCollageId())
-                .partnerId(collageOrder.getPartnerId())
-                .storeId(collageOrder.getStoreId())
-                .createCollageUserId(collageOrder.getCreateCollageUserId())
-                .createTime(collageOrder.getCreateTime())
-                .expireTime(collageOrder.getExpireTime())
-                .build();
-    }
-
     public CollageOrder toCollageOrder(CollageOrderDto collageOrderDto) {
         return CollageOrder.builder()
                 .collageId(collageOrderDto.getCollageId())
                 .partnerId(collageOrderDto.getPartnerId())
                 .storeId(collageOrderDto.getStoreId())
                 .createCollageUserId(collageOrderDto.getCreateCollageUserId())
-                .createTime(collageOrderDto.getCreateTime())
-                .expireTime(collageOrderDto.getExpireTime())
                 .build();
     }
 }

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

+package com.freemud.sdk.api.assortment.shoppingcart.constant;
+
+import java.util.Optional;
+
+public enum CollageLockStatus {
+    LOCKED(true, "已锁定"),
+    RELEASE(false, "未锁定");
+
+    private boolean value;
+
+    private String desc;
+
+    CollageLockStatus(Boolean value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public static CollageLockStatus getByValue(Object value) {
+        try {
+            return Boolean.parseBoolean(String.valueOf(value)) ? CollageLockStatus.LOCKED : CollageLockStatus.RELEASE;
+        } catch (ClassCastException e) {
+            return CollageLockStatus.RELEASE;
+        }
+    }
+
+    public Boolean getValue() {
+        return value;
+    }
+
+    public void setValue(Boolean value) {
+        this.value = value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

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;
 
@@ -43,14 +44,4 @@ public class CollageOrderDto
      * 门店ID
      */
     private String storeId;
-
-    /**
-     * 创建时间
-     */
-    private Long createTime;
-
-    /**
-     * 过期时间
-     */
-    private Long expireTime;
 }

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

@@ -14,7 +14,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrderDto;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-public interface CollageCarBaseService {
+public interface CollageOrderBaseService {
     /**
      * 查询拼单订单
      * @param collageOrderDto
@@ -35,4 +35,18 @@ public interface CollageCarBaseService {
      * @return
      */
     BaseResponse cancelCollageOrder(CollageOrderDto collageOrderDto);
+
+    /**
+     * 锁定拼单订单
+     * @param collageOrderDto
+     * @return
+     */
+    BaseResponse lockCollageOrder(CollageOrderDto collageOrderDto);
+
+    /**
+     * 解锁拼单订单
+     * @param collageOrderDto
+     * @return
+     */
+    BaseResponse unlockCollageOrder(CollageOrderDto collageOrderDto);
 }

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

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CollageOrder
+ * @Package cn.freemud.controller
+ * @Description:
+ * @author: hui.miao
+ * @date: 2020/9/28 18:07
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package cn.freemud.controller;
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.vo.CollageOrderRequestVo;
+import cn.freemud.service.impl.CollageOrderServiceImpl;
+import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
+import com.freemud.application.sdk.api.log.ApiAnnotation;
+import com.freemud.application.sdk.api.log.LogParams;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/shoppingCart/collage", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "拼单订单 controller", tags = {"拼单订单管理接口"})
+@Slf4j
+public class CollageOrderController {
+    @Autowired
+    private CollageOrderServiceImpl collageOrderServicel;
+
+    @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);
+    }
+
+    @ApiOperation(value = "创建拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId创建拼单订单信息")
+    @ApiImplicitParam(value = "请求", required = true, dataType = "CollageOrderRequestVo", name = "CollageOrderRequestVo")
+    @ApiAnnotation(logMessage = "createOrder")
+    @PostMapping(value = "/createOrder")
+    public BaseResponse createOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
+        return collageOrderServicel.createCollageOrder(request);
+    }
+
+    @ApiOperation(value = "取消拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId取消拼单订单，并删除相关拼单信息")
+    @ApiImplicitParam(value = "请求", required = true, dataType = "CollageOrderRequestVo", name = "CollageOrderRequestVo")
+    @ApiAnnotation(logMessage = "cancelOrder")
+    @PostMapping(value = "/cancelOrder")
+    public BaseResponse cancelCollageOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
+        return collageOrderServicel.cancelCollageOrder(request);
+    }
+
+    @ApiOperation(value = "锁定拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId锁定拼单订单")
+    @ApiImplicitParam(value = "请求", required = true, dataType = "CollageOrderRequestVo", name = "CollageOrderRequestVo")
+    @ApiAnnotation(logMessage = "lockOrder")
+    @PostMapping(value = "/lockOrder")
+    public BaseResponse lockCollageOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
+        return SDKCommonBaseContextWare.getBean(CollageOrderServiceImpl.class).lockCollageOrder(request);
+    }
+
+    @ApiOperation(value = "解锁拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId解锁拼单订单")
+    @ApiImplicitParam(value = "请求", required = true, dataType = "CollageOrderRequestVo", name = "CollageOrderRequestVo")
+    @ApiAnnotation(logMessage = "unlockOrder")
+    @PostMapping(value = "/unlockOrder")
+    public BaseResponse unlockCollageOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
+        return collageOrderServicel.unlockCollageOrder(request);
+    }
+}

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

@@ -13,54 +13,25 @@
 package cn.freemud.controller;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.entities.vo.*;
-import cn.freemud.enums.ResponseResult;
+import cn.freemud.entities.vo.AddShoppingCartGoodsRequestVo;
 import cn.freemud.service.impl.ShoppingCartCollageServiceImpl;
-import cn.freemud.utils.ResponseUtil;
-import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping(value = "/shoppingCart/collage", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api(value = "购物车 controller", tags = {"拼单购物车管理接口"})
 @Slf4j
 public class ShoppingCartCollageController {
-
-    @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 SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).queryCollageOrder(request);
-    }
-
-    @ApiOperation(value = "创建拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId创建拼单订单信息")
-    @ApiImplicitParam(value = "请求", required = true, dataType = "CollageOrderRequestVo", name = "CollageOrderRequestVo")
-    @ApiAnnotation(logMessage = "createOrder")
-    @PostMapping(value = "/createOrder")
-    public BaseResponse createOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
-        return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).createCollageOrder(request);
-    }
-
-    @ApiOperation(value = "取消拼单订单", notes = "根据商户ID、门店ID、当前登录用户sessionId取消拼单订单，并删除相关拼单信息")
-    @ApiImplicitParam(value = "请求", required = true, dataType = "CollageOrderRequestVo", name = "CollageOrderRequestVo")
-    @ApiAnnotation(logMessage = "cancelOrder")
-    @PostMapping(value = "/cancelOrder")
-    public BaseResponse cancelCollageOrder(@Validated @LogParams @RequestBody CollageOrderRequestVo request) {
-        return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).cancelCollageOrder(request);
-    }
-
     /**
      * 向拼单购物车中添加商品
      */
@@ -69,40 +40,4 @@ public class ShoppingCartCollageController {
     public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).addGoods(request);
     }
-
-    /**
-     * 修改拼单购物车中商品数量
-     */
-    @ApiAnnotation(logMessage = "updateGoodsQty")
-    @PostMapping(value = "/updateGoodsQty")
-    public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
-        return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).updateGoodsQty(request);
-    }
-
-    /**
-     * 查询购物车信息
-     */
-    @ApiAnnotation(logMessage = "listCartGoods")
-    @PostMapping(value = "/listCartGoods")
-    public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
-        return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).getGoodsList(request);
-    }
-
-    /**
-     * 清空自己的购物车
-     */
-    @ApiAnnotation(logMessage = "clearPartCartGoods")
-    @PostMapping(value = "/clearPartCartGoods")
-    public BaseResponse clearPartCartGoods(@Validated @LogParams @RequestBody ShoppingCartCollageClearRequestVo request) {
-        return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).clearPartCarGoods(request);
-    }
-
-    /**
-     * 清空购物车
-     */
-    @ApiAnnotation(logMessage = "clearCartGoods")
-    @PostMapping(value = "/clearCartGoods")
-    public BaseResponse clearCartGoods(@Validated @LogParams @RequestBody ShoppingCartClearRequestVo request) {
-        return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).clear(request);
-    }
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CollageOrderResponseVo.java

@@ -16,7 +16,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrder;
 import lombok.Data;
 
 @Data
-public class CollageOrderResponseVo extends BaseRequestVo {
+public class CollageOrderResponseVo {
     // 拼单订单信息
     private CollageOrder order;
 

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

@@ -2,7 +2,6 @@ package cn.freemud.service;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.CollageOrderRequestVo;
-import cn.freemud.entities.vo.ShoppingCartCollageClearRequestVo;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -16,7 +15,7 @@ import cn.freemud.entities.vo.ShoppingCartCollageClearRequestVo;
  * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
-public interface ShoppingCartCollageService {
+public interface CollageOrderService {
     /**
      * 查询拼单订单
      * @param request
@@ -39,10 +38,16 @@ public interface ShoppingCartCollageService {
     BaseResponse cancelCollageOrder(CollageOrderRequestVo request);
 
     /**
-     * 清空用户自己的购物车
-     *
+     * 锁定拼单订单
      * @param request
      * @return
      */
-    BaseResponse clearPartCarGoods(ShoppingCartCollageClearRequestVo request);
-}
+    BaseResponse lockCollageOrder(CollageOrderRequestVo request);
+
\ No newline at end of file
+    /**
+     * 解锁拼单订单
+     * @param request
+     * @return
+     */
+    BaseResponse unlockCollageOrder(CollageOrderRequestVo request);
+}

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

+package cn.freemud.service.impl;
+
+import cn.freemud.adapter.CollageOrderAdapter;
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.vo.CollageOrderRequestVo;
+import cn.freemud.entities.vo.CollageOrderResponseVo;
+import cn.freemud.enums.ResponseResult;
+import cn.freemud.service.CollageOrderService;
+import cn.freemud.utils.ResponseUtil;
+import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrder;
+import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrderDto;
+import com.freemud.sdk.api.assortment.shoppingcart.service.impl.CollageOrderBaseServiceImpl;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: null.java
+ * @Package
+ * @Description: (用一句话描述该文件做什么)
+ * @author: pegnfei.liu
+ * @date: 2020-9-24
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目的
+ */
+
+@Service
+public class CollageOrderServiceImpl implements CollageOrderService {
+    @Autowired
+    private CollageOrderAdapter collageOrderAdapter;
+    @Autowired
+    private CollageOrderBaseServiceImpl collageOrderBaseService;
+    @Autowired
+    private ShoppingCartCollageServiceImpl shoppingCartCollageService;
+
+
+    /**
+     * 查询拼单订单信息（拼单基础信息 拼单参与人列表）
+     * @param request(partnerId shopId userId)
+     * @return
+     */
+    @Override
+    public BaseResponse queryCollageOrder(CollageOrderRequestVo request) {
+        CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
+        // 查询时需传入拼单创建人的userId，若上送字段为空时，默认查询当前登录人自己的拼单信息
+        if (StringUtils.isEmpty(request.getCreateCollageUserId())) {
+            collageOrderDto.setCreateCollageUserId(this.getUserIdBySessionId(request.getSessionId()));
+        }
+        BaseResponse<CollageOrder> queryCollageOrderResponse = this.collageOrderBaseService.queryCollageOrder(collageOrderDto);
+        CollageOrder collageOrder = queryCollageOrderResponse.getResult();
+
+        if (ResponseResult.SUCCESS.getCode().equals(queryCollageOrderResponse.getCode()) && !ObjectUtils.isEmpty(collageOrder)) {
+            CollageOrderResponseVo collageOrderResponseVo = new CollageOrderResponseVo();
+            // 订单基础信息
+            collageOrderResponseVo.setOrder(collageOrder);
+
+            // TODO 订单参与人列表信息
+
+            return ResponseUtil.success(collageOrderResponseVo);
+        } else {
+            return ResponseUtil.error(ResponseResult.COLLAGE_NOT_EXIST);
+        }
+    }
+
+    /**
+     * 创建拼单订单基础信息
+     * @param request(partnerId shopId sessionId)
+     * @return
+     */
+    @Override
+    public BaseResponse createCollageOrder(CollageOrderRequestVo request) {
+        CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
+        // 根据sessionId查询对应登录用户信息
+        collageOrderDto.setCreateCollageUserId(this.getUserIdBySessionId(request.getSessionId()));
+
+        // 创建拼单订单基础缓存信息
+        BaseResponse<CollageOrder> createCollageOrderResponse = this.collageOrderBaseService.createCollageOrder(collageOrderDto);
+
+        if (ResponseResult.SUCCESS.getCode().equals(createCollageOrderResponse.getCode())) {
+            CollageOrderResponseVo collageOrderResponseVo = new CollageOrderResponseVo();
+            collageOrderResponseVo.setOrder(createCollageOrderResponse.getResult());
+
+            return ResponseUtil.success(collageOrderResponseVo);
+        } else {
+            return ResponseUtil.error(ResponseResult.COLLAGE_ALREADY_EXIST);
+        }
+    }
+
+    /**
+     * 取消拼单订单，删除相关缓存信息
+     * @param request
+     * @return
+     */
+    @Override
+    public BaseResponse cancelCollageOrder(CollageOrderRequestVo request) {
+        CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
+        // 根据sessionId查询对应登录用户信息
+        collageOrderDto.setCreateCollageUserId(this.getUserIdBySessionId(request.getSessionId()));
+        return this.collageOrderBaseService.cancelCollageOrder(collageOrderDto);
+    }
+
+    /**
+     * 锁定拼单订单
+     * @param request
+     * @return
+     */
+    @Override
+    public BaseResponse lockCollageOrder(CollageOrderRequestVo request) {
+        CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
+        // 根据sessionId查询对应登录用户信息
+        collageOrderDto.setCreateCollageUserId(this.getUserIdBySessionId(request.getSessionId()));
+        return this.collageOrderBaseService.lockCollageOrder(collageOrderDto);
+    }
+
+    /**
+     * 解锁拼单订单
+     * @param request
+     * @return
+     */
+    @Override
+    public BaseResponse unlockCollageOrder(CollageOrderRequestVo request) {
+        CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
+        // 根据sessionId查询对应登录用户信息
+        collageOrderDto.setCreateCollageUserId(this.getUserIdBySessionId(request.getSessionId()));
+        return this.collageOrderBaseService.unlockCollageOrder(collageOrderDto);
+    }
+
+    /**
+     * 根据sessionId查询登录用户的userId
+     * @param sessionId
+     * @return
+     */
+    private String getUserIdBySessionId(String sessionId) {
+        return this.shoppingCartCollageService.getCustomerInfoVo(sessionId).getMemberId();
+    }
+}

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

@@ -4,6 +4,7 @@ import cn.freemud.base.entity.BaseResponse;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrder;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CollageOrderDto;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.CollageCartBaseServiceImpl;
+import com.freemud.sdk.api.assortment.shoppingcart.service.impl.CollageOrderBaseServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
@@ -27,9 +28,9 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @EnableAutoConfiguration
-public class CollageCartBaseServiceTest {
+public class CollageOrderBaseServiceTest {
     @Autowired
-    private CollageCartBaseServiceImpl collageCartBaseService;
+    private CollageOrderBaseServiceImpl collageOrderBaseService;
 
     @Test
     public void queryCollageOrder() {
@@ -38,7 +39,7 @@ public class CollageCartBaseServiceTest {
                 .partnerId("partner1")
                 .storeId("store1")
                 .build();
-        BaseResponse<CollageOrder> response = collageCartBaseService.queryCollageOrder(collageOrderDto);
+        BaseResponse<CollageOrder> response = collageOrderBaseService.queryCollageOrder(collageOrderDto);
         log.debug("queryCollageOrder return: {}", response.getResult());
     }
 
@@ -49,7 +50,7 @@ public class CollageCartBaseServiceTest {
                 .partnerId("partner1")
                 .storeId("store1")
                 .build();
-        BaseResponse<CollageOrder> response = collageCartBaseService.createCollageOrder(collageOrderDto);
+        BaseResponse<CollageOrder> response = collageOrderBaseService.createCollageOrder(collageOrderDto);
         log.debug("createCollageOrder return: {}", response.getResult());
         Assert.assertNotNull(response.getResult());
     }
@@ -61,7 +62,7 @@ public class CollageCartBaseServiceTest {
                 .partnerId("partner1")
                 .storeId("store1")
                 .build();
-        BaseResponse response = collageCartBaseService.cancelCollageOrder(collageOrderDto);
+        BaseResponse response = collageOrderBaseService.cancelCollageOrder(collageOrderDto);
         log.debug("cancelCollageOrder return: {}", response.getResult());
     }
 }

shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartCollageServiceTest.java → shopping-cart-application-service/src/test/java/cn.freemud/service/CollageOrderServiceTest.java

@@ -2,7 +2,7 @@ package cn.freemud.service;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.CollageOrderRequestVo;
-import cn.freemud.service.impl.ShoppingCartCollageServiceImpl;
+import cn.freemud.service.impl.CollageOrderServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
@@ -26,10 +26,10 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @EnableAutoConfiguration
-public class ShoppingCartCollageServiceTest {
+public class CollageOrderServiceTest {
 
     @Autowired
-    private ShoppingCartCollageServiceImpl shoppingCartCollageService;
+    private CollageOrderServiceImpl collageOrderService;
 
     @Test
     public void queryCollageOrder() {
@@ -39,7 +39,7 @@ public class ShoppingCartCollageServiceTest {
                 .partnerId("partner1")
                 .shopId("store1")
                 .build();
-        BaseResponse response = shoppingCartCollageService.queryCollageOrder(request);
+        BaseResponse response = collageOrderService.queryCollageOrder(request);
         log.debug("queryCollageOrder return: {} {}", response.getCode(), response.getResult());
         Assert.assertNotNull(response.getCode());
     }
@@ -51,7 +51,7 @@ public class ShoppingCartCollageServiceTest {
                 .partnerId("partner1")
                 .shopId("store1")
                 .build();
-        BaseResponse response = shoppingCartCollageService.createCollageOrder(request);
+        BaseResponse response = collageOrderService.createCollageOrder(request);
         log.debug("createCollageOrder return: {} {}", response.getCode(), response.getResult());
         Assert.assertNotNull(response.getCode());
     }
@@ -63,7 +63,7 @@ public class ShoppingCartCollageServiceTest {
                 .partnerId("partner1")
                 .shopId("store1")
                 .build();
-        BaseResponse response = shoppingCartCollageService.cancelCollageOrder(request);
+        BaseResponse response = collageOrderService.cancelCollageOrder(request);
         log.debug("cancelCollageOrder return: {} {}", response.getCode(), response.getResult());
         Assert.assertNotNull(response.getCode());
     }