From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
index 8bb9f28..97261fb 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
@@ -40,9 +40,10 @@
Page<CouponMember> page = new Page<>(couponMemberDTO.getPageCurr(), couponMemberDTO.getPageSize());
LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(CouponMember::getCouponStatus,
- CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()));
+ CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()+1));
+ wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
wrapper1.eq(CouponMember::getDelFlag,0);
- Page<CouponMember> page1 = this.page(page, wrapper);
+ Page<CouponMember> page1 = this.page(page, wrapper1);
return PageDTO.of(page1);
}
@@ -57,4 +58,25 @@
byId.setCouponStatus(CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()));
this.updateById(byId);
}
+
+ @Override
+ public List<CouponMember> getCouponMemberl(CouponMemberDTO couponMemberDTO) {
+ LambdaQueryWrapper<CouponMember> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(CouponMember::getCouponStatus, CouponUseEnum.UNUSED);
+ wrapper.eq(CouponMember::getDelFlag,0);
+ List<CouponMember> couponMemberList=this.list(wrapper);
+ /* for (CouponMember couponMember:couponMemberList){
+ if(LocalDateTime.now().isAfter(couponMember.getEndDate())){
+ couponMember.setCouponStatus(0);
+ this.updateById(couponMember);
+ }
+ }*/
+ LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(CouponMember::getCouponStatus,
+ CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()+1));
+ wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
+ wrapper1.eq(CouponMember::getDelFlag,0);
+ List<CouponMember> page1 = this.list(wrapper1);
+ return page1;
+ }
}
--
Gitblit v1.7.1