From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
index 74c0c8b..0b9fc19 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
@@ -82,6 +82,12 @@
@PostMapping("/admin/operational/channels/deal")
Result channelsDeal(@RequestBody OperationalStatementsVo operationalStatementsVo);
+ /**
+ * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-娓犻亾鎬讳俊鎭�-瀵煎嚭
+ */
+ @PostMapping("/admin/operational/channels/deal/export")
+ Result channelsDealExport(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
/**
* 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-鏂板獟浣撴矇鐫″娓犻亾鐜伴噾涓氱哗
@@ -94,6 +100,12 @@
*/
@PostMapping("/admin/operational/shop/channels")
Result shopChannels(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
+ /**
+ * 鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-闂ㄨ瘖鍚勬笭閬撻澶╂垚浜ゆ儏鍐靛垎鏋�-瀵煎嚭
+ */
+ @PostMapping("/admin/operational/shop/channels/export")
+ Result shopChannelsExport(@RequestBody OperationalStatementsVo operationalStatementsVo);
/**
* 闂ㄥ簵&鍜ㄨ甯堣�佸甫鏂伴澶╂垚浜ら噾棰濆垎鏋�
@@ -137,5 +149,28 @@
@PostMapping("/admin/operational/rfm/data/list")
Result rfmDataList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+ /**
+ * 鍚勯棬搴楃幇閲戜笟缁╁畬鎴愭儏鍐�
+ */
+ @PostMapping("/admin/operational/shop/cash/complete/list")
+ Result shopCashCompleteList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
+ /**
+ * 鏈勾搴﹀悇鏈堢幇閲�&鎵ц涓氱哗瀹屾垚鎯呭喌
+ */
+ @PostMapping("/admin/operational/month/deduction/list")
+ Result monthDeductionList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
+ /**
+ * SPA浠ｇ帇涓氱哗鎶ヨ〃
+ */
+ @PostMapping("/admin/operational/channels/deal/dw/spa")
+ Result channelsSpaDw(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
+ /**
+ * SPA浠ｇ帇涓氱哗鎶ヨ〃-瀵煎嚭
+ */
+ @PostMapping("/admin/operational/channels/deal/dw/spa/export")
+ Result channelsSpaDwExport(@RequestBody OperationalStatementsVo operationalStatementsVo);
}
--
Gitblit v1.8.0