From 73f86cb94faa49f1157d6c9f00737a28f63507f4 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 09:52:48 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 136 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 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 a25a868..c127c81 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集合
@@ -10758,7 +10758,7 @@
* 收货地址id
* @return 删除结果
*/
- @PostMapping("/shopFlower/shopDelUserAddress")
+ @DeleteMapping("/shopFlower/shopDelUserAddress")
R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);
/**
@@ -10794,7 +10794,7 @@
* @param orderId 订单id
* @return 订单详情
*/
- @PostMapping("/shopFlower/orderDetail")
+ @GetMapping("/shopFlower/orderDetail")
R orderDetailFlower(@RequestParam("orderId") Long orderId);
/**
@@ -10812,7 +10812,7 @@
* @param orderId 订单id
* @return 删除结果
*/
- @PostMapping("/shopFlower/orderDelete")
+ @DeleteMapping("/shopFlower/orderDelete")
R orderDeleteFlower(@RequestParam("orderId") Long orderId);
/**
@@ -10881,7 +10881,7 @@
* @param pageComShopFlowerEvaluateDTO
* @return
*/
- @PostMapping("/pageEvaluate")
+ @PostMapping("/shopFlower/pageEvaluate")
R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);
/**
@@ -10975,10 +10975,124 @@
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 userId
* @return
*/
@GetMapping("/shopFlower/selectCountByDeliveryType")
- R selectCountByDeliveryType(Integer deliveryType);
+ R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId") Long userId);
+
+ /**
+ * 查询我的店铺各类统计数据
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountByUserId")
+ R selectCountByUserId(@RequestParam("userId") Long userId);
+
+
+ /**
+ * 创建退款订单
+ * @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(@RequestParam("storeId") Long storeId);
+
+ /**
+ * 新增商品浏览量
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("/shopFlower/incrGoodsView")
+ R incrGoodsView(@RequestParam("goodsId") Long goodsId);
+
+ /**
+ * 出入账分页
+ * @param pageComShopFlowerOrderPayDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageOrderPay")
+ R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);
+
+ /**
+ * 获取商家的营业额和可结算金额
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/getQuota")
+ R getQuota(@RequestParam("storeId") Long storeId);
+
+ /**
+ * 取消退款
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/refundOrderCancel")
+ R refundOrderCancel(@RequestParam("id") Long id);
+
+ /**
+ * 退款订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/refundOrderDetail")
+ R refundOrderDetail(@RequestParam("id") Long id);
+
+ /**
+ * 清点商品 确认送达详情
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageOrderByDeliveryNo")
+ R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+ /**
+ * 商家后台经营数据统计-上
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectSumOrderAndAmountByStoreId")
+ R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId);
+
+ /**
+ * 统计时间区域的订单量 15天 30天 一年
+ * @param storeId
+ * @param type
+ * @return
+ */
+ @GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type);
}
--
Gitblit v1.7.1