From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
index 1e8ce93..90a8da2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
@@ -197,9 +197,9 @@
* @param orderId 订单id
* @return 订单详情
*/
- @PostMapping("orderDetail")
- public R orderDetailFlower(@RequestParam("orderId") Long orderId) {
- return comShopFlowerOrderService.orderDetail(orderId);
+ @GetMapping("orderDetail")
+ public R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone) {
+ return comShopFlowerOrderService.orderDetail(orderId,phone);
}
/**
@@ -219,7 +219,7 @@
* @param orderId 订单id
* @return 删除结果
*/
- @PostMapping("orderDelete")
+ @DeleteMapping("orderDelete")
public R orderDeleteFlower(@RequestParam("orderId") Long orderId) {
return comShopFlowerOrderService.orderDelete(orderId);
}
@@ -516,4 +516,65 @@
}
+ /**
+ * 商家后台经营数据统计-上
+ * @param storeId
+ * @return
+ */
+ @GetMapping("selectSumOrderAndAmountByStoreId")
+ public R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId){
+ return comShopFlowerOrderService.selectSumOrderAndAmountByStoreId(storeId);
+ }
+
+ /**
+ * 统计时间区域的订单量 15天 30天 一年
+ * @param storeId
+ * @param type
+ * @return
+ */
+ @GetMapping("selectOrderLineChart")
+ public R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type,@RequestParam("tab") Integer tab){
+ return comShopFlowerOrderService.selectOrderLineChart(storeId,type,tab);
+ }
+
+ /**
+ * 取消退款
+ * @param id
+ * @return
+ */
+ @GetMapping("refundOrderCancel")
+ public R refundOrderCancel(@RequestParam("id") Long id){
+ return comShopFlowerRefundOrderService.orderCancel(id);
+ }
+
+ /**
+ * 退款订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("refundOrderDetail")
+ public R refundOrderDetail(@RequestParam("id") Long id){
+ return comShopFlowerRefundOrderService.refundOrderDetail(id);
+ }
+
+ /**
+ * 清点商品 确认送达详情
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageOrderByDeliveryNo")
+ public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){
+ return comShopFlowerOrderService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
+ }
+
+ /**
+ * 统计上架的上下架商品数量
+ * @param userId
+ * @return
+ */
+ @GetMapping("/countSaleByUserId")
+ R countSaleByUserId(@RequestParam("userId") Long userId){
+ return comShopFlowerGoodsService.countSaleByUserId(userId);
+ }
+
}
--
Gitblit v1.7.1