From 15c1d716e6a89b38e6af36b62fc372b93779df01 Mon Sep 17 00:00:00 2001
From: puhanshu <hansgoallout@163.com>
Date: 星期三, 22 九月 2021 23:02:50 +0800
Subject: [PATCH] 便民服务小程序

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
index 722152b..78af34d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -6,6 +6,7 @@
 import javax.validation.Valid;
 
 import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageMerchantProductDTO;
 import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -600,7 +601,27 @@
      * @return
      */
     @PostMapping("/merchant/classify")
-    public R getClassifyMerchants(PageClassifyMerchantDTO pageClassifyMerchantDTO) {
+    public R getClassifyMerchants(@RequestBody PageClassifyMerchantDTO pageClassifyMerchantDTO) {
         return convenientMerchantService.getClassifyMerchants(pageClassifyMerchantDTO);
     }
+
+    /**
+     * 小程序获取商家详情
+     * @param merchantId
+     * @return
+     */
+    @GetMapping("/merchant/detail")
+    public R getMerchantDetail(@RequestParam("merchantId") Long merchantId) {
+        return convenientMerchantService.getMerchantDetail(merchantId);
+    }
+
+    /**
+     * 小程序获取商家产品
+     * @param pageMerchantProductDTO
+     * @return
+     */
+    @PostMapping("/merchant/product")
+    public R getMerchantProduct(@RequestBody PageMerchantProductDTO pageMerchantProductDTO) {
+        return convenientProductService.getMerchantProduct(pageMerchantProductDTO);
+    }
 }

--
Gitblit v1.7.1