From 2d6c4eb6ef31179407203fbb46bb931640f3b41b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:46:02 +0800
Subject: [PATCH] #feat 商家后台登录问题修改i
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 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 768a72d..d8e74c0 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
@@ -6580,6 +6580,14 @@
R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);
/**
+ * 获取用户便民服务商家详情
+ * @param account 商家绑定账号
+ * @return
+ */
+ @GetMapping("/convenient/getMerchantInfoByAccount")
+ R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account);
+
+ /**
* 获取商便民服务商家信息
* @param userId
* @return
@@ -10758,7 +10766,7 @@
* 收货地址id
* @return 删除结果
*/
- @PostMapping("/shopFlower/shopDelUserAddress")
+ @DeleteMapping("/shopFlower/shopDelUserAddress")
R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);
/**
@@ -10794,7 +10802,7 @@
* @param orderId 订单id
* @return 订单详情
*/
- @PostMapping("/shopFlower/orderDetail")
+ @GetMapping("/shopFlower/orderDetail")
R orderDetailFlower(@RequestParam("orderId") Long orderId);
/**
@@ -10812,7 +10820,7 @@
* @param orderId 订单id
* @return 删除结果
*/
- @PostMapping("/shopFlower/orderDelete")
+ @DeleteMapping("/shopFlower/orderDelete")
R orderDeleteFlower(@RequestParam("orderId") Long orderId);
/**
@@ -10881,7 +10889,7 @@
* @param pageComShopFlowerEvaluateDTO
* @return
*/
- @PostMapping("/pageEvaluate")
+ @PostMapping("/shopFlower/pageEvaluate")
R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);
/**
@@ -11048,4 +11056,44 @@
*/
@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