Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-09-06 f27bfd01251ea5ff742f0ad175b88c0c16bd5c8c

 src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java

@@ -82,5 +82,14 @@
     */
    Page<CouponTemplateVO> getPointPage(Page page, QueryActivePointCouponDTO dto);

    /**
     * 获取活动优惠券
     * 1.需要领取时间在有效期内的
     * 2.已经发布的
     * @param dto
     * @return
     */
    List<CouponTemplateVO> getActivityEffectList(QueryActivityEffectCouponDTO dto);

    void exchangeCoupon(ExchangeCouponDTO dto);
}