From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 77c8a58..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
@@ -1,11 +1,14 @@
package com.dsh.activity.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.feignclient.model.CouponExamineListSearch;
import com.dsh.activity.feignclient.model.CouponListOfSearch;
import com.dsh.activity.model.CouponListVo;
+import com.dsh.activity.model.request.IntegralGoodsOfSearch;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -13,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
@@ -25,12 +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(Integer id, List<Integer> ids, Integer type);
+
+ void updateType(Long id);
}
--
Gitblit v1.7.1