From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java |   16 +++++++++++++---
 1 files changed, 13 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 1b89adc..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,10 +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;
 
@@ -12,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
@@ -24,10 +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);
+
+    void updateType(Long id);
 }

--
Gitblit v1.7.1