From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
index 3f7fcf6..d363e3f 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java
@@ -16,11 +16,12 @@
* @author zhibing.pu
* @date 2023/6/24 11:26
*/
-public interface ICouponService extends IService<Coupon>{
+public interface ICouponService extends IService<Coupon> {
/**
* 获取购买会员支付成功页面的优惠券
+ *
* @param uid
* @return
* @throws Exception
@@ -28,15 +29,15 @@
List<CouponListVo> queryCouponList(Integer uid, Integer distributionMethod) throws Exception;
-
-
Map<String, Object> queryConponRuleOfJson(Integer id);
List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch);
+ List<Map<String, Object>> queryCouponListOfSearch1(CouponListOfSearch ofSearch);
+
List<Map<String, Object>> queryCouponExamineList(CouponExamineListSearch ofSearch);
- List<Map<String, Object>> listRecord(Page<Object> objectPage, Integer id, List<Integer> ids, Integer type);
+ List<Map<String, Object>> listRecord(Integer id, List<Integer> ids, Integer type);
void updateType(Long id);
}
--
Gitblit v1.7.1