From d5bd38ef60044ef056a0525a6c5adff155ee55cd Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 23 九月 2021 18:23:16 +0800
Subject: [PATCH] 便民服务小程序

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java |  100 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 95 insertions(+), 5 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 78af34d..2709601 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
@@ -5,9 +5,10 @@
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
+import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
 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 com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -617,11 +618,100 @@
 
     /**
      * 小程序获取商家产品
-     * @param pageMerchantProductDTO
+     * @param merchantId
      * @return
      */
-    @PostMapping("/merchant/product")
-    public R getMerchantProduct(@RequestBody PageMerchantProductDTO pageMerchantProductDTO) {
-        return convenientProductService.getMerchantProduct(pageMerchantProductDTO);
+    @GetMapping("/product/list")
+    public R getMerchantProduct(@RequestParam("merchantId") Long merchantId) {
+        return convenientProductService.getMerchantProduct(merchantId);
+    }
+
+    /**
+     * 获取产品详情
+     * @param productId
+     * @return
+     */
+    @GetMapping("/product/detail")
+    public R getProductDetail(@RequestParam("productId") Long productId) {
+        return convenientProductService.getProduct(productId);
+    }
+
+    /**
+     * 搜索商家信息
+     * @param pageSearchDTO
+     * @return
+     */
+    @PostMapping("/merchant/search")
+    public R pageSearchMerchant(@RequestBody PageSearchDTO pageSearchDTO) {
+        return convenientMerchantService.pageSearchMerchant(pageSearchDTO);
+    }
+
+    /**
+     * 搜索商品信息
+     * @param pageSearchDTO
+     * @return
+     */
+    @PostMapping("/product/search")
+    public R pageSearchProduct(@RequestBody PageSearchDTO pageSearchDTO) {
+        return convenientProductService.pageSearchProduct(pageSearchDTO);
+    }
+
+    /**
+     * 增加商家店铺咨询量
+     * @param merchantId
+     * @return
+     */
+    @GetMapping("/merchant/consult")
+    public R consultMerchant(@RequestParam("merchantId") Long merchantId) {
+        return convenientMerchantService.consultMerchant(merchantId);
+    }
+
+    /**
+     * 增加商家店铺浏览量
+     * @param merchantId
+     * @return
+     */
+    @GetMapping("/merchant/incr-view")
+    public R incrMerchantView(@RequestParam("merchantId") Long merchantId) {
+        return convenientMerchantService.incrMerchantView(merchantId);
+    }
+
+    /**
+     * 增加产品浏览量
+     * @param productId
+     * @return
+     */
+    @GetMapping("/product/incr-view")
+    public R incrProductView(@RequestParam("productId") Long productId) {
+        return convenientProductService.incrProductView(productId);
+    }
+
+    /**
+     * 获取商家导出数据
+     * @param exportMerchantDTO
+     * @return
+     */
+    @PostMapping("/merchant/export")
+    public R exportMerchant(@RequestBody ExportMerchantDTO exportMerchantDTO) {
+        return convenientMerchantService.exportMerchant(exportMerchantDTO);
+    }
+
+    /**
+     * 定时任务每隔半小时将商家浏览量和咨询量总值计入指定商家数据中
+     * @return
+     */
+    @PostMapping("/timedTaskWriteDataToMerchantJobHandler")
+    public R timedTaskWriteDataToMerchantJobHandler() {
+        return convenientMerchantService.timedTaskWriteDataToMerchantJobHandler();
+    }
+
+    /**
+     * 获取商家上下架产品数量
+     * @param merchantId
+     * @return
+     */
+    @GetMapping("/product/shelf-num")
+    public R getProductShelfNum(@RequestParam("merchantId") Long merchantId) {
+        return convenientProductService.getProductShelfNum(merchantId);
     }
 }

--
Gitblit v1.7.1