Merge branch 'dev' of http://10.2.1.24:10244/bpa/BPA.KitChen.Web into dev

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,
         });

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);

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);