From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderService.java
index 8499e98..cf6bb1d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderService.java
@@ -56,7 +56,7 @@
* 订单id
* @return 订单详情
*/
- R orderDetail(Long orderId);
+ R orderDetail(Long orderId,String phone);
/**
* 根据订单id取消订单
@@ -171,9 +171,10 @@
* 统计时间区域的订单量 15天 30天 一年
* @param storeId
* @param type
+ * @param tab
* @return
*/
- R selectOrderLineChart(Long storeId,Integer type);
+ R selectOrderLineChart(Long storeId,Integer type,Integer tab);
/**
* 清点商品 确认送达详情
--
Gitblit v1.7.1