From f747c717505ae19d0875d51abc8d5a889a01123b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 22 十一月 2022 09:08:07 +0800
Subject: [PATCH] #feat 联调问题修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
index 6580a2b..3180335 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
@@ -4,11 +4,13 @@
 import com.panzhihua.applets.weixin.CheckService;
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
 import com.panzhihua.common.model.dtos.shop.*;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
 import com.panzhihua.common.model.vos.shop.*;
 import com.panzhihua.common.service.community.CommunityService;
 import com.panzhihua.common.validated.AddGroup;
@@ -370,8 +372,8 @@
      */
     @ApiOperation(value = "查询我的店铺各类统计数据")
     @GetMapping("/selectCountByStoreId")
-    public R selectCountByStoreId(Long storeId){
-        return communityService.selectCountByStoreId(storeId);
+    public R selectCountByUserId(Long storeId){
+        return communityService.selectCountByUserId(storeId);
     }
 
 
@@ -421,4 +423,16 @@
         return communityService.selectCountGroupStatus(storeId);
     }
 
+    @ApiOperation(value = "商品分类")
+    @GetMapping("/goodsCategory/getAllGoodsCategories")
+    public R getAllGoodsCategories() {
+        return communityService.getAllGoodsCategories();
+    }
+    @ApiOperation(value = "分页查询便民服务分类", response = ConvenientServiceCategoryVO.class)
+    @PostMapping("/service-category/page")
+    public R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO) {
+        pageConvenientServiceCategoryDTO.setAreaCode(this.getAreaCode());
+        return communityService.pageServiceCategory(pageConvenientServiceCategoryDTO);
+    }
+
 }

--
Gitblit v1.7.1