From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 970ef48..f5274a1 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,23 +1,43 @@
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;
/**
* @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
*/
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);
+
+ void updateType(Long id);
}
--
Gitblit v1.7.1