diff --git a/CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs b/CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs index b1e3a358..51b6bfd2 100644 --- a/CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs +++ b/CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs @@ -144,7 +144,7 @@ namespace CoreCms.Net.Repository .Where((coupon, promotion) => promotion.type == (int)GlobalEnumVars.PromotionType.Coupon) .WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.noUsed.ToString(), (coupon, promotion) => coupon.isUsed == false && coupon.endTime >= dt) .WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.yesUsed.ToString(), (coupon, promotion) => coupon.isUsed == true) - .WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.invalid.ToString(), (coupon, promotion) => coupon.endTime < dt) + .WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.invalid.ToString(), (coupon, promotion) => coupon.endTime < dt && coupon.isUsed == false) .WhereIF(promotionId > 0, (coupon, promotion) => coupon.promotionId == promotionId) .WhereIF(promotionId == 0, (coupon, promotion) => promotion.isEnable == true) .Select((coupon, promotion) => new CoreCmsCoupon diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue index 18beafa7..47ab8959 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue @@ -19,12 +19,12 @@ - {{item.couponCode}} + {{item.couponName}} - {{itemResult}} + 说明:{{itemResult}} 有效期:{{item.stime}} - {{item.etime}}