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

cloudroam

2024-10-12 24e21f8ce1a28a78a58f9a95cc6438b4a9c737a6

 src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java

@@ -160,6 +160,7 @@
                    couponRecordDO.setPoint(couponTemplateDO.getPoint());
                    couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
                    couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
                    couponRecordDO.setCouponDescription(couponTemplateDO.getCouponDescription());


                    // 根据优惠券模板来计算优惠券的生效开始时间和结束时间
@@ -292,6 +293,7 @@
                    couponRecordDO.setEffectiveEnd(lastDayEnd);
                    couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
                    couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
                    couponRecordDO.setCouponDescription(couponTemplateDO.getCouponDescription());
                    // 创建信息
                    couponRecordDO.create();
                    if(!checkCurMonVipCouponExists(couponRecordDO.getCouponId(),couponRecordDO.getCustomerId(),firstDayStart,lastDayEnd)){