|
|
|
@ -24,7 +24,7 @@ namespace EasyAbp.EShop.Plugins.Coupons.Coupons |
|
|
|
return DbSet |
|
|
|
.Where(x => x.ExpirationTime > now) |
|
|
|
.Join( |
|
|
|
DbContext.CouponTemplates.Where(x => x.UsableBeginTime <= now), |
|
|
|
DbContext.CouponTemplates.Where(x => !x.UsableBeginTime.HasValue || x.UsableBeginTime.Value <= now), |
|
|
|
coupon => coupon.CouponTemplateId, |
|
|
|
couponTemplate => couponTemplate.Id, |
|
|
|
(coupon, couponTemplate) => coupon |
|
|
|
|