From 87f6cce44f87f9df74ef737ea831bed9ceed490c Mon Sep 17 00:00:00 2001 From: tangxiaobao <303826152@qq.com> Date: 星期四, 14 四月 2022 09:24:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop --- 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