From 8f9845717f6989792e2a6003adf5fe12ff0a9540 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 23 十一月 2022 16:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 80 ++++++++++++++++++++++++++++++++-------
1 files changed, 65 insertions(+), 15 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..fcea17b 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
@@ -2974,11 +2974,11 @@
/**
* 删除商品
*
- * @param id
+ * @param goodsId
* @return
*/
- @PostMapping("/shopFlower/deleteShopGoods")
- R deleteFlowerShopGoods(@RequestBody Long[] id);
+ @DeleteMapping("/shopFlower/deleteShopGoods")
+ R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId);
/**
* 修改商品状态
@@ -2990,12 +2990,12 @@
R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
/**
- * 修改商品状态
+ * 商品详情
*
* @param goodsId
* @return
*/
- @PostMapping("/shopFlower/shopGoodsDetail")
+ @GetMapping("/shopFlower/shopGoodsDetail")
R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);
@@ -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();
/**
@@ -10975,10 +10975,60 @@
R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);
/**
+ * 获取社区动态置顶banner
+ * @param communityId 社区id
+ * */
+ @PostMapping("/easyphoto/getUserRewardsNew")
+ R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
* 统计查询订单数量
* @param deliveryType
+ * @param storeId
* @return
*/
@GetMapping("/shopFlower/selectCountByDeliveryType")
- R selectCountByDeliveryType(Integer deliveryType);
+ R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("storeId") Long storeId);
+
+ /**
+ * 查询我的店铺各类统计数据
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountByStoreId")
+ R selectCountByStoreId(Long storeId);
+
+
+ /**
+ * 创建退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/createRefundOrder")
+ R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);
+
+ /**
+ * 分页查询
+ * @param pageComOrderRefundDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageRefundOrder")
+ R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO);
+
+ /**
+ * 修改退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/updateRefundOrder")
+ R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);
+
+
+ /**
+ * 商家后台-退款申请统计
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountGroupStatus")
+ R selectCountGroupStatus(Long storeId);
}
--
Gitblit v1.7.1