From d81a9b79631105d1603bfe5bdff88b71741c77c9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 14 十月 2023 20:05:55 +0800
Subject: [PATCH] 便民服务 商家评价 金汇地图
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
index f804970..0463dd2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -2,18 +2,17 @@
import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.vos.jinhui.JinghuiMerchantEvaluateVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
/**
* 金汇社区
@@ -86,6 +85,11 @@
public R recordExpurgateData(@RequestParam("id") String id);
+ /*************************************************************************************************
+ *
+ * 办事指南
+ *
+ ***************************************************************************************************/
/**
* 办事指南_新增
@@ -96,7 +100,7 @@
*/
@PostMapping("/JinhuiWorkGuide/addworkguide")
@Transactional(rollbackFor = Exception.class)
- public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId);
+ public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") String userId);
/**
* 办事指南_编辑
@@ -106,7 +110,7 @@
*/
@PostMapping("/JinhuiWorkGuide/editworkguide")
@Transactional(rollbackFor = Exception.class)
- public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId) ;
+ public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") String userId) ;
/**
* 办事指南_详情
@@ -136,7 +140,7 @@
* @return 删除结果
*/
@PostMapping("/JinhuiWorkGuide/delectworkguide")
- R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId) ;
+ R delectWorkGuide(@RequestParam("workGuideId") String workGuideId) ;
/**
* 分页查询办事执念-分类管理 addWorkGuideClassify 分页查询办事执念-分类管理
@@ -166,7 +170,7 @@
* @date 2021/8/31 15:03
*/
@GetMapping("/JinhuiWorkGuide/workGuide/classify/delete")
- public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId) ;
+ public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") String workGuideClassifyId) ;
/**
* 办事指南-分类管理列表查询 getWorkGuideClassifyList 办事指南-分类管理列表查询
@@ -191,7 +195,104 @@
* @return 办事指南列表数据
*/
@GetMapping("/JinhuiWorkGuide/listworkguide/classify")
- public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) ;
+ public R listWorkGuideByClassifyId(@RequestParam("classifyId") String classifyId) ;
+
+
+ /**********************************************************************************************
+ *
+ *
+ * 便民服务
+ *
+ *
+ ************************************************************************************************/
+
+ /**
+ * 删除便民服务商家
+ *
+ * @param merchantId
+ * @return
+ */
+ @DeleteMapping("/jinhuiMerchant/delete")
+ public R deleteMerchant(@RequestParam("merchantId") String merchantId, @RequestParam("operator") String operator);
+
+ /**
+ * 分页查询便民服务商家 运营后台
+ *
+ * @param pageConvenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/jinhuiMerchant/page")
+ public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);
+
+ /**
+ * 获取便民服务商家详情
+ *
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/get")
+ public R getMerchant(@RequestParam("merchantId") String merchantId);
+
+
+ /**
+ * 分页查询 商家类别
+ * @param
+ * @return
+ */
+ @GetMapping("/jinhuiMerchant/getCategories")
+ public R getListCategories(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+
+ /**************************************************************************************************************
+ *
+ *
+ * 商家评论
+ *
+ *
+ *************************************************************************************************************/
+ /**
+ * 商家评论列表
+ * @param pageNum
+ * @param pageSize
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/jinghuiMerchantEvaluate/getList")
+ public R merchantEvaluateGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("merchantId") String merchantId);
+
+ /**
+ * 商家评论列单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/jinghuiMerchantEvaluate/getDetails")
+ public R merchantEvaluateGetDetails(@RequestParam("id") String id);
+ /**
+ * 商家评论列添加
+ * @param
+ * @return
+ */
+ @PostMapping("/jinghuiMerchantEvaluate/addData")
+ public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item);
+
+ /**
+ * 商家评论列编辑
+ * @param item
+ * @return
+ */
+ @PostMapping("/jinghuiMerchantEvaluate/editData")
+ public R merchantEvaluateEditData(@RequestBody JinghuiMerchantEvaluateVO item);
+
+ /**
+ * 商家评论列删除
+ * @param id
+ * @return
+ */
+ @PostMapping("/jinghuiMerchantEvaluate/expurgateData")
+ public R merchantEvaluateExpurgateData(@RequestParam("id") String id);
--
Gitblit v1.7.1