From 48a703dec596b5d2c1b04b0b4f7ed0f28c1ca898 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 13 十一月 2023 18:00:50 +0800
Subject: [PATCH] 新增社区共建评论模块2
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 275 insertions(+), 11 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..2afed60 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
@@ -39,6 +39,7 @@
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.entity.VolunteerCommunityConfigVO;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
@@ -11334,7 +11335,8 @@
*/
@GetMapping("/VolunteerType/volunteerTypeGetList")
public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize);
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("type") String type);
/**
* 新增
@@ -11415,7 +11417,7 @@
* @param grantIntegral
* @return
*/
- @PostMapping("/grantIntegral")
+ @PostMapping("/VolunteerActivitiesPeople/grantIntegral")
public R grantIntegral(@RequestBody GrantIntegral grantIntegral);
/**************************************************************************************************************
@@ -11494,7 +11496,9 @@
public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
@RequestParam(value = "name", required = false) String name,
- @RequestParam(value = "state", required = false) String state);
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "goodType", required = false) String goodType,
+ @RequestParam(value = "merchantId", required = false) String merchantId);
/**
* 新增
@@ -11508,7 +11512,7 @@
public R VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
- @PostMapping("/unmount")
+ @PostMapping("/VolunteerIntegralMerchant/unmount")
public R VolunteerIntegralMerchantUnmount(@RequestBody VolunteerIntegralMerchantVO vimVO);
@DeleteMapping("/VolunteerIntegralMerchant/deleteById")
@@ -11528,7 +11532,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,
@@ -11537,14 +11541,16 @@
@RequestParam(value = "condition", required = false) String condition,
@RequestParam(value = "userName", required = false) String userName,
@RequestParam(value = "communityId", required = false) String communityId,
- @RequestParam(value = "userId", required = false) String userId);
+ @RequestParam(value = "userId", required = false) String userId,
+ @RequestParam(value = "orderType", required = false) String orderType,
+ @RequestParam(value = "merchantId", required = false) String merchantId);
/**
* 查询详情
* @param id
* @return
*/
- @GetMapping("order/getData")
+ @GetMapping("/VolunteerIntegralMerchant/order/getData")
public R getData(@RequestParam("id") String id);
/**
@@ -11552,15 +11558,23 @@
* @param
* @return
*/
- @PostMapping("/order/insertData")
+ @PostMapping("/VolunteerIntegralMerchant/order/insertData")
public R insertData(@RequestBody VolunteerCreditsExchangeVO item);
+
+ /**
+ * 新增用户购买商家商品记录
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralMerchant/order/insertMerchantData")
+ public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item);
/**
* 更新
* @param item
* @return
*/
- @PostMapping("/order/update")
+ @PostMapping("/VolunteerIntegralMerchant/order/update")
public R update(@RequestBody VolunteerCreditsExchangeVO item);
/**
@@ -11568,7 +11582,7 @@
* @param id
* @return
*/
- @DeleteMapping("/order/delete")
+ @DeleteMapping("/VolunteerIntegralMerchant/order/delete")
public R delete(@RequestParam("id") String id);
/**
@@ -11576,9 +11590,259 @@
* @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("id") String id);
+
+ @GetMapping("/VolunteerMerchant/getUser")
+ public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId,
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "userPhone", required = false)String userPhone);
+
+
+ @GetMapping("/VolunteerMerchant/getById")
+ public R volunteerMerchantGetById(@RequestParam("id") String id);
+
+ /**
+ * 是否是商家
+ * @param userId
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/isMerchant")
+ public R isMerchant(@RequestParam("userId") String userId);
+
+
+ /**
+ * 社区取消订单
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralMerchant/order/communityCancellation")
+ public R communityCancellation(@RequestParam("id") String id);
+
+
+
+
+
+ /****************************************************************************************************************
+ *
+ * 商家评论
+ *
+ ***************************************************************************************************************/
+
+ /**
+ * 商家评论分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/evaluate/getList")
+ public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam("merchantId") String merchantId);
+
+ /**
+ * 商家评论获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/evaluate/getData")
+ public R volunteerMerchantGetData(@RequestParam("id") String id);
+
+ /**
+ * 商家评论新增评价
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/evaluate/insert")
+ public R volunteerMerchantInsert(@RequestBody VolunteerMerchantEvaluateVO item);
+
+ /**
+ * 商家评论更新评价
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/evaluate/update")
+ public R volunteerMerchantUpdate(@RequestBody VolunteerMerchantEvaluateVO item);
+
+
+ /**
+ * 商家评论删除评价
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerMerchant/evaluate/delete")
+ public R volunteerMerchantDelete(@RequestParam("id") String id);
+
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区商家提现
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 商家提现列表啊
+ * @param disposeType
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/withdraw/getList")
+ public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "disposeType", required = false) String disposeType,
+ @RequestParam(value = "merchantName", required = false) String merchantName,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "communityId", required = false) String communityId);
+
+ /**
+ * 新增商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/withdraw/insert")
+ public R WithdrawInsert(@RequestBody VolunteerMerchantWithdrawVO item);
+
+ /**
+ * 编辑商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/withdraw/update")
+ public R WithdrawUpdate(@RequestBody VolunteerMerchantWithdrawVO item);
+
+ /**
+ * 删除商家提现
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/withdraw/delete")
+ public R WithdrawDelete(@RequestParam("id") String id);
+
+ /**
+ * 处理商家提现
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/withdraw/dispose")
+ public R WithdrawDispose(@RequestParam("id") String id);
+
+
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/Community/Config/getData")
+ public R ConfiggetData(@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/Community/Config/insertvo")
+ public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item);
+
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 社区折扣
+ *
+ *
+ ******************************************************************************************************************/
+
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/community/discount/getList")
+ public R CommunityDiscountgetList(@RequestParam("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/community/discount/insert")
+ public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item);
+
+
+ @PostMapping("/VolunteerMerchant/community/discount/update")
+ public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item);
+
+
+ @DeleteMapping("/VolunteerMerchant/community/discount/delete")
+ public R CommunityDiscountdelete(@RequestParam("id") String id);
+
+
+
+
+ /**
+ * 报名/取消报名社区活动
+ * 金汇社区专用
+ * @param signactivityVO
+ * 报名参数
+ * @return 报名 取消报名 结果
+ */
+ @PostMapping("/jinhui/jinhuiSignActivity")
+ public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO);
+
+
+
+ /**
+ * 用户签到
+ * 金汇社区专用
+ * @param comActActRegistVO 签到参数
+ * @return 签到结果
+ */
+ @PostMapping("/jinhui/jinhuiActivitySignIn")
+ public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO);
--
Gitblit v1.7.1