个人购物车将个人数据覆盖整单数据

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

@@ -291,6 +291,17 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
 
         shoppingCartCollageResponseVo.setUserProducts(userProducts);
 
+        // 个人购物车将个人数据覆盖整单数据
+        if (StringUtils.isEmpty(currentUserId) && userProducts.size() > 0) {
+            // 个人购物车隐藏满减提示
+            shoppingCartCollageResponseVo.setActivityTip(new ActivityTip());
+            // 个人购物车不展示
+            shoppingCartCollageResponseVo.setTotalAmount(userProducts.get(0).getTotalAmount());
+            shoppingCartCollageResponseVo.setOriginalTotalAmount(userProducts.get(0).getOriginalTotalAmount());
+            shoppingCartCollageResponseVo.setTotalDiscountAmount(0L);
+            shoppingCartCollageResponseVo.setNewPackAmount(userProducts.get(0).getPackPrice());
+        }
+
         return shoppingCartCollageResponseVo;
     }
 
@@ -500,8 +511,6 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         }else if(shoppingCartInfoRequestVo.getType() != null && shoppingCartInfoRequestVo.getType().intValue() == 0){
             // 根据人员分类购物车 个人购物车
             shoppingCartCollageResponseVo = splitByUser(shoppingCartGoodsResponseVo,crateUserId,partnerId,storeId,currentUserId);
-            // 个人购物车隐藏满减提示
-            shoppingCartCollageResponseVo.setActivityTip(new ActivityTip());
         }else{
             // 整合购物车
             shoppingCartCollageResponseVo = new ShoppingCartCollageResponseVo();