From b2d9fdab193e24d83dd5e59c22594a2b8e0dafbc Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 23 四月 2024 12:50:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
index 809ec04..6fcbdab 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
@@ -18,12 +18,32 @@
     @PostMapping(value = "/market/activity/list")
     Result list(@RequestBody MarketActivityDto dto);
 
+    /** 鍒嗙被tab鍒楄〃 */
+    @PostMapping(value = "/market/activity/tabData")
+    Result tabData(@RequestBody MarketActivityDto dto);
+
+    /** 椤堕儴杞挱鍥炬暟鎹� */
+    @PostMapping(value = "/market/activity/topBannerData")
+    Result topBannerData(@RequestBody MarketActivityDto dto);
+
     /** 璇︽儏 */
     @PostMapping(value = "/market/activity/detail")
     Result detail(@RequestBody MarketActivityDto dto);
 
+    /** 纭鏌ョ湅 */
+    @PostMapping(value = "/market/activity/confirmView")
+    Result confirmView(@RequestBody MarketActivityDto dto);
+
     /** 棰嗗彇浼樻儬鍒� */
     @PostMapping(value = "/market/activity/receiveCoupon")
     Result receiveCoupon(@RequestBody MarketActivityDto dto);
 
+    /** 瀹℃壒鍒楄〃 */
+    @PostMapping(value = "/market/activity/approve/list")
+    Result pendingApproveCoupon(@RequestBody MarketActivityDto dto);
+
+    /** 鎿嶄綔瀹℃壒棰嗗彇浼樻儬鍒� */
+    @PostMapping(value = "/market/activity/receive/approve/callback/admin")
+    Result receiveApproveCallbackAdmin(@RequestBody MarketActivityDto dto);
+
 }

--
Gitblit v1.8.0