Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 d643b843cc794d8f59c4ecd04bda2b9d35e5b22a

 cloud-server-activity/src/main/java/com/dsh/activity/service/ICouponService.java

@@ -16,18 +16,17 @@
 * @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);