From c743f4413a00fc063bbbd9d851b6d0c3fff10581 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 31 七月 2023 10:04:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 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..1b89adc 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 @@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.dsh.activity.entity.Coupon; +import com.dsh.activity.feignclient.model.CouponListOfSearch; import com.dsh.activity.model.CouponListVo; import java.util.List; +import java.util.Map; /** * @author zhibing.pu @@ -20,4 +22,12 @@ * @throws Exception */ List<CouponListVo> queryCouponList(Integer uid, Integer distributionMethod) throws Exception; + + + + + Map<String, Object> queryConponRuleOfJson(Integer id); + + List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch); + } -- Gitblit v1.7.1