From 2b1a2bbe4240deb8a56f3fadbced0cbb4fa87137 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 30 十月 2023 15:16:53 +0800
Subject: [PATCH] 新增查询未绑定网格接口

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
index 4d4df5f..bf87453 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -11,6 +11,7 @@
 import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
+import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
 import com.panzhihua.common.model.vos.jinhui.*;
 import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
 import com.panzhihua.common.service.community.CommunityService;
@@ -200,6 +201,16 @@
         return jinhuiCommunityService.getListCategories(pageNum, pageSize);
     }
 
+
+
+    @ApiOperation(value = "便民服务商家入驻")
+    @PostMapping("/merchant/addData")
+    public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item)
+    {
+        item.setAuditType("1");
+        item.setCreatedBy(getUserId()+"");
+        return jinhuiCommunityService.merchantAddData(item);
+    }
 
     /***************************************************************************************************
      *
@@ -857,6 +868,43 @@
     }
 
 
+    /****************************************************************************************************************
+     *
+     *
+     *                                  金汇慈善公益
+     *
+     *
+     ******************************************************************************************************************/
+    /**
+     * 分页查询
+     *
+     * @param
+     * @return
+     */
+
+    @ApiOperation(value = "金汇慈善公益列表",response = JinhuiCharityVO.class)
+    @GetMapping("/getCharityList")
+    public R getCharityList(@RequestParam("pageNum") int pageNum,
+                            @RequestParam("pageSize") int pageSize,
+                            @RequestParam(value = "title", required = false) String title,
+                            @RequestParam(value = "label", required = false) String label,
+                            @RequestParam(value = "state", required = false) String state)
+    {
+        return jinhuiCommunityService.getCharityList(pageNum,pageSize,title,label,state);
+    }
+
+
+    /**
+     * 获取详情
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "金汇慈善公益详情",response = JinhuiCharityVO.class)
+    @GetMapping("/getCharityDetails")
+    public R getCharityDetails(@RequestParam("id") String id)
+    {
+        return jinhuiCommunityService.getCharityDetails(id);
+    }
 
 
 }

--
Gitblit v1.7.1