Merge remote-tracking branch 'origin/developer' into developerA

src/main/java/com/caimei365/order/controller/CartClubApi.java

@@ -58,6 +58,19 @@ public class CartClubApi {
         return cartClubService.getShoppingCartHead(userId);
     }
 
+    /**
+     * 获取购物车商品种类
+     */
+    @ApiOperation("获取购物车数量（旧：/home/modules内）")
+    @ApiImplicitParam(required = true, name = "userId", value = "用户Id")
+    @GetMapping("/cart/count")
+    public ResponseJson<Integer> getShoppingCartCount(Integer userId) {
+        if (null == userId) {
+            return ResponseJson.error("用户Id不能为空！", null);
+        }
+        return cartClubService.getUserCartCount(userId);
+    }
+
     /**
      * 添加购物车
      *

src/main/java/com/caimei365/order/service/CartClubService.java

@@ -120,4 +120,11 @@ public interface CartClubService {
      * @param status 状态: 1未领取 2已领取
      */
     ResponseJson<Map<String, Object>> getShopCoupons(Integer userId, Integer shopId, Integer source, Integer status);
+
+    /**
+     * 获取机构购物车数量（商品种类数）
+     *
+     * @param userId 用户ID
+     */
+    ResponseJson<Integer> getUserCartCount(Integer userId);
 }

src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -627,6 +627,18 @@ public class CartClubServiceImpl implements CartClubService {
         return ResponseJson.success("删除成功！返回购物车数量", cartCount);
     }
 
+    /**
+     * 获取机构购物车数量（商品种类数）
+     *
+     * @param userId 用户ID
+     */
+    @Override
+    public ResponseJson<Integer> getUserCartCount(Integer userId) {
+        // 获取购物车数量（商品种类数）
+        int cartCount = getCartCount(userId);
+        return ResponseJson.success(cartCount);
+    }
+
     /**
      * 获取机构购物车数量（商品种类数）
      *
@@ -1284,5 +1296,4 @@ public class CartClubServiceImpl implements CartClubService {
         return ResponseJson.success(map);
     }
 
-
 }