From c2af7240d43586b8e3cc295e9e97f7d24278025d Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期一, 27 五月 2024 14:37:54 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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..69b165d 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
@@ -11,19 +11,39 @@
  * @USER: fhx
  * @DATE: 2023/8/2
  **/
-@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-market-activity")
+@FeignClient(name="phi-platform-user",path = "/phip",contextId = "phip-market-activity")
 public interface SPhipMarketActivityService {
 
     /** 鍒楄〃 */
     @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