拼单购物车清空增加点餐位的清空

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

@@ -289,12 +289,36 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
             request.put("partnerId",partnerId);
             request.put("storeId",storeId);
             request.put("userId",userId);
+            request.put("sessionId",sessionId);
             ErrorLog.printErrorLog("获取获取拼单点餐位异常", "CollageCartBaseServiceImpl/getCollageMemberHashKey", request,  e);
             return null;
         }
     }
 
     /**
+     * 获取拼单点餐位人员信息
+     * @param partnerId
+     * @param storeId
+     * @param userId
+     * @return
+     */
+    public Set<String> getCollageMember(String partnerId, String storeId, String userId) {
+        try {
+            String collageMemberHashKey = genCollageMemberHashKey(partnerId, storeId, userId);
+            return redisCache.getRedisTemplate().boundHashOps(collageMemberHashKey).keys();
+        } catch (Exception e) {
+            Map<String,String> request = new HashMap<>();
+            request.put("partnerId",partnerId);
+            request.put("storeId",storeId);
+            request.put("userId",userId);
+            ErrorLog.printErrorLog("获取拼单点餐位人员信息异常", "CollageCartBaseServiceImpl/getCollageMember", request,  e);
+            return null;
+        }
+    }
+
+
+
+    /**
      * 构建拼单用户选好的状态缓存key
      * @param partnerId
      * @param storeId

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

@@ -168,7 +168,10 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
             }
 
             // 更新拼单购物车人员缓存中的的购物车行id集合
-            List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
+            List<String> cartGoodsUids = new ArrayList<>();
+            if(null != cartGoodsRedisList){
+                cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
+            }
             collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
 
         } catch (Exception e) {
@@ -297,7 +300,10 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
             List<CartGoods> cartGoodsRedisList = assortmentSdkService.setShoppingCart(partnerId, storeId, crateUserId, cartGoodsList, currentUserId, "", collageCartBaseService);
 
             // 更新拼单购物车人员缓存中的的购物车行id集合
-            List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
+            List<String> cartGoodsUids = new ArrayList<>();
+            if(null != cartGoodsRedisList){
+                cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
+            }
             collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
 
         } catch (Exception e) {
@@ -399,7 +405,10 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
                 List<CartGoods> cartGoodsRedisList = assortmentSdkService.setShoppingCart(partnerId, storeId, crateUserId, cartGoodsList, currentUserInfoVo.getSessionId(), "", this.collageCartBaseService);
 
                 // 更新拼单购物车人员缓存中的的购物车行id集合
-                List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
+                List<String> cartGoodsUids = new ArrayList<>();
+                if(null != cartGoodsRedisList){
+                    cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
+                }
                 collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
             }
         } catch (Exception e) {
@@ -477,6 +486,13 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         cartParamDto.setStoreId(storeId);
         cartParamDto.setUserId(createCollageUserId);
         collageCartBaseService.clear(cartParamDto, LogThreadLocal.getTrackingNo());
+
+        // 更新拼单购物车人员缓存中的的购物车行id集合
+        // 获取点餐位的购物车行
+        Set<String> member = collageCartBaseService.getCollageMember(partnerId,storeId,createCollageUserId);
+        for(String mem : member){
+            collageCartBaseService.updateCollageCartGoodsUids(new ArrayList<>(),partnerId, storeId, createCollageUserId,mem);
+        }
         return ResponseUtil.success();
     }