From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
index bf14918..01560a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
@@ -69,18 +69,20 @@
         if (Objects.isNull(communityId)) {
             return R.fail("社区id不能为空");
         }
-        return communityService.getSuitableServiceCategories(communityId);
+        return communityService.getSuitableServiceCategories(communityId,this.getAreaCode());
     }
 
     @ApiOperation(value = "分页获取热门商家", response = ConvenientMerchantVO.class)
     @PostMapping("/merchant/popular")
     public R getPopularMerchants(@RequestBody @Valid PagePopularMerchantDTO pagePopularMerchantDTO) {
+        pagePopularMerchantDTO.setAreaCode(this.getAreaCode());
         return communityService.getPopularMerchants(pagePopularMerchantDTO);
     }
 
     @ApiOperation(value = "分页获取服务类型下商家", response = ConvenientMerchantVO.class)
     @PostMapping("/merchant/classify")
     public R getClassifyMerchants(@RequestBody @Valid PageClassifyMerchantDTO pageClassifyMerchantDTO) {
+        pageClassifyMerchantDTO.setAreaCode(this.getAreaCode());
         return communityService.getClassifyMerchants(pageClassifyMerchantDTO);
     }
 

--
Gitblit v1.7.1