From b020f119176dcc1c60ec1c97bd03d9a3efe8b5fa Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 06 十二月 2023 19:14:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java | 8 ++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
index 00f9493..c1cf692 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
@@ -56,6 +56,13 @@
private String activityCouponId;
/** 钀ラ攢娲诲姩鍒嗙粍id */
private String groupId;
+ /** 钀ラ攢娲诲姩棰嗗彇璁板綍瀛愰」itemid */
+ private String recordItemId;
+ /**瀹℃牳鐘舵�� 鏌ヨ 0=鏃犻渶瀹℃壒 1=寰呭鎵� 2=瀹℃壒鎴愬姛 3=瀹℃壒澶辫触*/
+ private Integer approvalStatus;
+ /**瀹℃壒鐘舵�� 閫氳繃=agree 鎷掔粷=reject*/
+ private String statusStr;
+
/** 骞冲彴绫诲瀷(PlatformConstants) */
private String platformType;
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 5066ee7..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
@@ -38,4 +38,12 @@
@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