From 3ffa739e77cdafdc4be1aa153acb3423071cd102 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 21 四月 2021 11:26:08 +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, 15 insertions(+), 0 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 a7bf930..4bbbd67 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
@@ -1788,6 +1788,13 @@
 
 
     /**
+     * 根据电话号获取店铺
+     * @param phone 电话号
+     */
+    @GetMapping("/shop/getStoreByPhone")
+    R getStoreByPhone(@RequestParam("phone") String phone);
+
+    /**
      * 编辑店铺、启用、禁用
      * @param storeVO 数据
      * @param id 商铺id
@@ -1911,6 +1918,14 @@
     R shopCartList(@RequestParam("userId") Long userId);
 
     /**
+     * 查询用户购物车数量
+     * @param userId    用户id
+     * @return  用户购物车商品数量
+     */
+    @PostMapping("/shop/shopCartUserTotal")
+    R shopCartUserTotal(@RequestParam("userId") Long userId);
+
+    /**
      * 购物车添加
      * @param comShopCartDTO    请求参数
      * @return  购物车列表

--
Gitblit v1.7.1