From 0ffc55f78dfb3cc561540af2d033e64c2f4f2e68 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 29 八月 2023 09:57:08 +0800
Subject: [PATCH] 新增商家管理模块

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 70542af..3cdb075 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11334,7 +11334,8 @@
      */
     @GetMapping("/VolunteerType/volunteerTypeGetList")
     public R volunteerTypeGetList(@RequestParam("pageNum")  int pageNum,
-                                  @RequestParam("pageSize")  int pageSize);
+                                  @RequestParam("pageSize")  int pageSize,
+                                  @RequestParam("type")   String type);
 
     /**
      * 新增
@@ -11528,7 +11529,7 @@
      * @param
      * @return
      */
-    @GetMapping("order/getList")
+    @GetMapping("/VolunteerIntegralMerchant/order/getList")
     public R getList(@RequestParam("pageNum") int pageNum,
                      @RequestParam("pageSize")  int pageSize,
                      @RequestParam(value = "goodsId", required = false) String goodsId,
@@ -11544,7 +11545,7 @@
      * @param id
      * @return
      */
-    @GetMapping("order/getData")
+    @GetMapping("/VolunteerIntegralMerchant/order/getData")
     public R getData(@RequestParam("id") String id);
 
     /**
@@ -11552,7 +11553,7 @@
      * @param
      * @return
      */
-    @PostMapping("/order/insertData")
+    @PostMapping("/VolunteerIntegralMerchant/order/insertData")
     public R insertData(@RequestBody VolunteerCreditsExchangeVO item);
 
     /**
@@ -11560,7 +11561,7 @@
      * @param item
      * @return
      */
-    @PostMapping("/order/update")
+    @PostMapping("/VolunteerIntegralMerchant/order/update")
     public R update(@RequestBody VolunteerCreditsExchangeVO item);
 
     /**
@@ -11568,7 +11569,7 @@
      * @param id
      * @return
      */
-    @DeleteMapping("/order/delete")
+    @DeleteMapping("/VolunteerIntegralMerchant/order/delete")
     public R delete(@RequestParam("id") String id);
 
     /**
@@ -11576,10 +11577,48 @@
      * @param id
      * @return
      */
-    @GetMapping("/order/conditionData")
+    @GetMapping("/VolunteerIntegralMerchant/order/conditionData")
     public R conditionData(@RequestParam("id") String id);
 
+    /*****************************************************************************************************************
+     *
+     *
+     *                        路北社区商家管理
+     *
+     *
+     *****************************************************************************************************************/
+    /**
+     * 分页查询
+     * @param
+     * @return
+     */
+    @GetMapping("/VolunteerMerchant/getList")
+    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+                                      @RequestParam("pageSize") int pageSize,
+                                      @RequestParam(value = "merchantState", required = false) String merchantState,
+                                      @RequestParam(value = "merchantType", required = false) String merchantType,
+                                      @RequestParam(value = "name", required = false) String name,
+                                      @RequestParam(value = "communityId", required = false) String communityId);
+
+    /**
+     * 新增
+     * @param
+     * @return
+     */
+    @PostMapping("/VolunteerMerchant/insert")
+    public R insertVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);
 
 
+    @PostMapping("/VolunteerMerchant/update")
+    public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);
+
+
+    @DeleteMapping("/VolunteerMerchant/delete")
+    public R deleteVolunteerMerchant(@RequestParam("pageNum") String id);
+
+    @GetMapping("/VolunteerMerchant/getUser")
+    public R volunteerMerchantGetUser(@RequestParam("pageNum") String communityId,
+                                      @RequestParam("pageNum") String userName,
+                                      @RequestParam("pageNum") String userPhone);
 
 }

--
Gitblit v1.7.1