冲突解决

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

+package cn.freemud.service;
+
+import cn.freemud.adapter.ActivityAdapter;
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.constant.ShoppingCartConstant;
+import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.activity.ActivityQueryDto;
+import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
+import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
+import cn.freemud.entities.vo.*;
+import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.enums.GoodsTypeEnum;
+import cn.freemud.enums.ResponseResult;
+import cn.freemud.interceptor.ServiceException;
+import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
+import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
+import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title:
+ * @Package cn.freemud.service
+ * @Description:
+ * @author: ping.wu
+ * @date: 2018/5/18 19:49
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+public interface ShoppingCartCollageService {
+
+    BaseResponse clearPartCarGoods(ShoppingCartCollageClearRequestVo shoppingCartCollageClearRequestVo);
+
+}

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

@@ -18,6 +18,7 @@ import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.CommonService;
 import cn.freemud.service.CouponService;
+import cn.freemud.service.ShoppingCartCollageService;
 import cn.freemud.service.ShoppingCartNewService;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.utils.PropertyConvertUtil;
@@ -60,7 +61,7 @@ import java.util.stream.Collectors;
  */
 
 @Service
-public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl implements ShoppingCartNewService {
+public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl implements ShoppingCartNewService, ShoppingCartCollageService {
 
     @Autowired
     private AssortmentSdkService assortmentSdkService;
@@ -92,76 +93,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
     @Autowired
     private CouponAdapter couponAdapter;
 
-    /**
-     * 查询拼单订单信息（拼单基础信息 拼单参与人列表）
-     * @param request(partnerId shopId userId)
-     * @return
-     */
-    @Override
-    public BaseResponse queryCollageOrder(CollageOrderRequestVo request) {
-        CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
-        // 查询时需传入拼单创建人的userId，若上送字段为空时，默认查询当前登录人自己的拼单信息
-        if (StringUtils.isEmpty(request.getCreateCollageUserId())) {
-            CustomerInfoVo currentUserInfoVo = this.getCustomerInfoVo(request.getSessionId());
-            collageOrderDto.setCreateCollageUserId(currentUserInfoVo.getMemberId());
-        }
-        BaseResponse<CollageOrder> queryCollageOrderResponse = this.collageCartBaseService.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);
-        }*/
-        return null;
-    }
-
-    /**
-     * 创建拼单订单基础信息
-     * @param request(partnerId shopId sessionId)
-     * @return
-     */
-    @Override
-    public BaseResponse createCollageOrder(CollageOrderRequestVo request) {
-        CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
-        // 根据sessionId查询对应登录用户信息
-        CustomerInfoVo currentUserInfoVo = this.getCustomerInfoVo(request.getSessionId());
-        collageOrderDto.setCreateCollageUserId(currentUserInfoVo.getMemberId());
-
-        // 创建拼单订单基础缓存信息
-        BaseResponse<CollageOrder> createCollageOrderResponse = this.collageCartBaseService.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查询对应登录用户信息
-        CustomerInfoVo currentUserInfoVo = this.getCustomerInfoVo(request.getSessionId());
-        collageOrderDto.setCreateCollageUserId(currentUserInfoVo.getMemberId());
-
-        return this.collageCartBaseService.cancelCollageOrder(collageOrderDto);
-    }
 
     @Override
     public BaseResponse addGoodsByCard(AddGoodsByWeixinCardRequestVo request) {