From aed9f32d06e11082a977a77731541d4837d070c3 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 四月 2021 16:16:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
index fa1c2c7..100b4ef 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -118,6 +118,16 @@
     public R getUserStoreInfo(@RequestParam("userId") Long userId) {
         return comShopStoreService.getUserStoreInfo(userId);
     }
+    /**
+     * 获取用户商铺详细
+     *
+     * @param account 用户账号
+     * @return
+     */
+    @GetMapping("/getUserStoreInfoByAccount")
+    public R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account) {
+        return comShopStoreService.getUserStoreInfo(account);
+    }
 
     /**
      * 添加商城后台日志
@@ -190,16 +200,6 @@
     @PostMapping("shopCartList")
     public R shopCartList(@RequestParam("userId") Long userId) {
         return comShopCartService.shopCartList(userId);
-    }
-
-    /**
-     * 查询用户购物车数量
-     * @param userId    用户id
-     * @return  用户购物车商品数量
-     */
-    @PostMapping("shopCartUserTotal")
-    public R shopCartUserTotal(@RequestParam("userId") Long userId) {
-        return comShopCartService.shopCartUserTotal(userId);
     }
 
     /**

--
Gitblit v1.7.1