合车逻辑修正

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

@@ -292,7 +292,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         shoppingCartCollageResponseVo.setUserProducts(userProducts);
 
         // 个人购物车将个人数据覆盖整单数据
-        if (StringUtils.isEmpty(currentUserId) && userProducts.size() > 0) {
+        if (!StringUtils.isEmpty(currentUserId) && userProducts.size() > 0) {
             // 个人购物车隐藏满减提示
             shoppingCartCollageResponseVo.setActivityTip(new ActivityTip());
             // 个人购物车不展示