Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

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

@@ -81,4 +81,15 @@
     * @return
     */
    Page<CouponTemplateVO> getPointPage(Page page, QueryActivePointCouponDTO dto);

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

    void exchangeCoupon(ExchangeCouponDTO dto);
}