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/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 694e132..e3b4f7c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1918,14 +1918,6 @@
R shopCartList(@RequestParam("userId") Long userId);
/**
- * 查询用户购物车数量
- * @param userId 用户id
- * @return 用户购物车商品数量
- */
- @PostMapping("/shop/shopCartUserTotal")
- R shopCartUserTotal(@RequestParam("userId") Long userId);
-
- /**
* 购物车添加
* @param comShopCartDTO 请求参数
* @return 购物车列表
@@ -2086,6 +2078,13 @@
R getUserStoreInfo(@RequestParam("userId") Long userId);
/**
+ * 获取用户商户详情
+ * @param account 用户账号
+ */
+ @GetMapping("/shop/getUserStoreInfoByAccount")
+ R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account);
+
+ /**
* 订单导出信息
* @param comShopOrderExportDTO 订单导出信息
* @return 订单导出信息
--
Gitblit v1.7.1