拼单购物车个人清除清除

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

@@ -115,7 +115,7 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
             operations.putAll(cartGoodsMap);
             operations.expire(expire,TimeUnit.SECONDS);
 
-            return CartResponseUtil.success();
+            return CartResponseUtil.success(cartParamDto.getCartGoodsList());
         } catch (Exception e) {
             ErrorLog.printErrorLog("设置拼单购物车异常", "CollageCartBaseServiceImpl/setCartGoodsList", cartParamDto,  e);
             return null;
@@ -312,16 +312,16 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
      * @param userId
      * @return
      */
-    public Boolean getCollageMemStateHashKey(String partnerId, String storeId, String userId,String sessionId) {
+    public Boolean getCollageMemStateHashKey(String partnerId, String storeId, String userId,String currentUserId) {
         try {
             String collageMemberHashKey = genCollageMemberStateHashKey(partnerId, storeId, userId);
-            return redisCache.hashGet(collageMemberHashKey,sessionId);
+            return redisCache.hashGet(collageMemberHashKey,currentUserId);
         } catch (Exception e) {
             Map<String,String> request = new HashMap<>();
             request.put("partnerId",partnerId);
             request.put("storeId",storeId);
             request.put("userId",userId);
-            request.put("sessionId",sessionId);
+            request.put("currentUserId",currentUserId);
             ErrorLog.printErrorLog("获取拼单用户选好的状态异常", "CollageCartBaseServiceImpl/getCollageMemStateHashKey", request,  e);
             return null;
         }
@@ -333,11 +333,11 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
      * @param partnerId
      * @param storeId
      * @param crateUserId
-     * @param sessionId
+     * @param userId
      */
-    public void updateCollageCartGoodsUids(List<String> cartGoodsUids,String partnerId,String storeId,String crateUserId,String sessionId){
+    public void updateCollageCartGoodsUids(List<String> cartGoodsUids,String partnerId,String storeId,String crateUserId,String userId){
         String collageMemberKey = genCollageMemberHashKey(partnerId, storeId, crateUserId);
-        redisCache.hashPut(collageMemberKey,sessionId,cartGoodsUids);
+        redisCache.hashPut(collageMemberKey,userId,cartGoodsUids);
     }
 
     /**
@@ -345,21 +345,21 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
      * @param partnerId
      * @param storeId
      * @param crateUserId
-     * @param sessionId
+     * @param userId
      * @return
      */
-    public List<String> getCollageCartGoodsUids(String partnerId,String storeId,String crateUserId,String sessionId){
+    public List<String> getCollageCartGoodsUids(String partnerId,String storeId,String crateUserId,String userId){
         try {
             String collageMemberKey = genCollageMemberHashKey(partnerId, storeId, crateUserId);
             BoundHashOperations<String, String, List<String>> operations = redisTemplate.boundHashOps(collageMemberKey);
-            List<String> goodsUids = operations.get(sessionId);
+            List<String> goodsUids = operations.get(userId);
             return goodsUids;
         } catch (Exception e) {
             Map<String,String> request = new HashMap<>();
             request.put("partnerId",partnerId);
             request.put("storeId",storeId);
             request.put("crateUserId",crateUserId);
-            request.put("sessionId",crateUserId);
+            request.put("userId",crateUserId);
             ErrorLog.printErrorLog("获取拼单人员缓存购物车行异常", "CollageCartBaseServiceImpl/getCollageCartGoodsUids", request, e);
             return null;
         }

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

@@ -145,6 +145,7 @@ public enum ResponseResult {
     COLLAGE_ALREADY_CHOOSE("49004", "拼单商品已经选购结束，请确定"),
     COLLAGE_ALREADY_EXIST("49005", "当前用户存在进行中的拼单订单"),
     COLLAGE_NOT_OWNER("49006", "当前用户不是拼单发起人，无法操作"),
+    COLLAGE_GOOD_NOT_ONESELF("49007", "只能操作自己的商品"),
 
 
     /**