From 15b40a8bdbfb582502457a777c9cb07d0b0a86aa Mon Sep 17 00:00:00 2001
From: yangwenhua <1289978696@qq.com>
Date: Tue, 12 Jul 2022 14:11:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=90=A5=E6=94=B6=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/order-market-report/service.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/order/order-market-report/service.js b/src/pages/order/order-market-report/service.js
index 7820383..639ef70 100644
--- a/src/pages/order/order-market-report/service.js
+++ b/src/pages/order/order-market-report/service.js
@@ -3,7 +3,7 @@ import { request } from 'umi';
 export default {
     //获取分页数据
     getMarketReportList(data) {
-        return request(`/kitchen/api/report-statistics/marketing-report`, {
+        return request(`/kitchen/api/report-statistics/cash-register-report`, {
             method: 'Post',
             data: data,
         });
@@ -18,7 +18,7 @@ export default {
 
     //下载报表
     marketingReportExport(data) {
-        return request(`/kitchen/api/report-statistics/marketing-report-export`, {
+        return request(`/kitchen/api/report-statistics/cash-register-report-export`, {
             method: 'Post',
             data: data,
         });

From e018511dc927d1b4fdb0d654e23ead3e8ecbffe5 Mon Sep 17 00:00:00 2001
From: yangwenhua <1289978696@qq.com>
Date: Tue, 12 Jul 2022 14:40:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=96=E6=B6=88shopIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/order-product-report/index.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/order/order-product-report/index.jsx b/src/pages/order/order-product-report/index.jsx
index 17a3110..60203e6 100644
--- a/src/pages/order/order-product-report/index.jsx
+++ b/src/pages/order/order-product-report/index.jsx
@@ -120,6 +120,7 @@ export default function Index() {
             "startTime": timeRange[0],
             "endTime": timeRange[1]
         }
+        if (!currentOrg.key) delete jsonData.shopIds;
         setShowLoading(true);
         const response = await productAPI.getProductEcharts(jsonData);
         setShowLoading(false);

From e6b8996edefa043b68ae3e298121b8e660dd5f88 Mon Sep 17 00:00:00 2001
From: yangwenhua <1289978696@qq.com>
Date: Tue, 12 Jul 2022 15:14:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/order-member-statement/index.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/order/order-member-statement/index.jsx b/src/pages/order/order-member-statement/index.jsx
index c0ca33d..a1c148e 100644
--- a/src/pages/order/order-member-statement/index.jsx
+++ b/src/pages/order/order-member-statement/index.jsx
@@ -111,6 +111,7 @@ export default function Index() {
             "startTime": timeRange[0],
             "endTime": timeRange[1]
         }
+        if (!currentOrg.key) delete jsonData.shopIds;
         setShowLoading(true);
         const response = await marketAPI.getMemberReport(jsonData);
         setShowLoading(false);