From 0e7584f11e1da29ce07f5f21048197dd155f1574 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 18 十一月 2022 09:47:17 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 411a6d5..4956269 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
@@ -10590,7 +10590,7 @@
@GetMapping("/sanshuo/expert/backstageList2")
R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
- @RequestParam(value = "size",required = false)Integer size);
+ @RequestParam(value = "size",required = false)Integer size,@RequestParam(value = "keyWord",required = false)String keyWord);
/**
* 查询社区id集合
@@ -10651,7 +10651,7 @@
* @param operator
* @return
*/
- @DeleteMapping("/point/delete")
+ @DeleteMapping("/convenient/point/delete")
R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);
/**
@@ -10659,7 +10659,7 @@
* @param pointId
* @return
*/
- @GetMapping("/point/detail")
+ @GetMapping("/convenient/point/detail")
R detailPoint(@RequestParam("pointId") Long pointId);
/**
@@ -10667,7 +10667,7 @@
* @param convenientGoodsCategoryDTO
* @return
*/
- @PostMapping("/goodsCategory/add")
+ @PostMapping("/convenient/goodsCategory/add")
R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
/**
@@ -10675,7 +10675,7 @@
* @param convenientGoodsCategoryDTO
* @return
*/
- @PutMapping("/goodsCategory/put")
+ @PutMapping("/convenient/goodsCategory/put")
R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
/**
@@ -10683,7 +10683,7 @@
* @param categoryId
* @return
*/
- @DeleteMapping("/goodsCategory/delete")
+ @DeleteMapping("/convenient/goodsCategory/delete")
R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
/**
@@ -10691,7 +10691,7 @@
* @param categoryId
* @return
*/
- @GetMapping("/goodsCategory/get")
+ @GetMapping("/convenient/goodsCategory/get")
R getGoodsCategory(@RequestParam("categoryId") Long categoryId);
/**
@@ -10699,7 +10699,7 @@
* @param pageConvenientGoodsCategoryDTO
* @return
*/
- @PostMapping("/goodsCategory/page")
+ @PostMapping("/convenient/goodsCategory/page")
R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);
@GetMapping("/dataCount")
@@ -10718,7 +10718,7 @@
* 获取所有商品分类
* @return
*/
- @GetMapping("/goodsCategory/getAllGoodsCategories")
+ @GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
R getAllGoodsCategories();
/**
@@ -10981,4 +10981,11 @@
*/
@GetMapping("/shopFlower/selectCountByDeliveryType")
R selectCountByDeliveryType(Integer deliveryType);
+
+ /**
+ * 获取社区动态置顶banner
+ * @param communityId 社区id
+ * */
+ @PostMapping("/easyphoto/getUserRewardsNew")
+ R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
}
--
Gitblit v1.7.1