From e0502b670f7cdd957d3bc60365b49bbba32f1e45 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 17 六月 2024 11:16:11 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 62 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 9 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 f50c186..9f88795 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
@@ -4,12 +4,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.enums.CouponUseEnum;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
-import com.ruoyi.system.api.domain.CouponMember;
import com.ruoyi.promotion.mapper.CouponMemberMapper;
import com.ruoyi.promotion.service.ICouponMemberService;
-import java.time.LocalDateTime;
+import com.ruoyi.system.api.domain.CouponMember;
+import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import java.util.List;
import org.springframework.stereotype.Service;
@@ -28,20 +28,22 @@
@Override
public PageDTO<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
LambdaQueryWrapper<CouponMember> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(CouponMember::getCouponStatus,1);
+ wrapper.eq(CouponMember::getCouponStatus, CouponUseEnum.UNUSED);
wrapper.eq(CouponMember::getDelFlag,0);
List<CouponMember> couponMemberList=this.list(wrapper);
- for (CouponMember couponMember:couponMemberList){
+ /* for (CouponMember couponMember:couponMemberList){
if(LocalDateTime.now().isAfter(couponMember.getEndDate())){
couponMember.setCouponStatus(0);
this.updateById(couponMember);
}
- }
+ }*/
Page<CouponMember> page = new Page<>(couponMemberDTO.getPageCurr(), couponMemberDTO.getPageSize());
LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(CouponMember::getCouponStatus,couponMemberDTO.getCouponStatus());
+ wrapper1.eq(CouponMember::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);
}
@@ -53,7 +55,49 @@
@Override
public void updCouponMember(CouponMemberDTO couponMemberDTO) {
CouponMember byId = this.getById(couponMemberDTO.getId());
- byId.setCouponStatus(couponMemberDTO.getCouponStatus());
+ 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;
+ }
+
+ @Override
+ public List<CouponMember> updCouponMember1(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()));
+ wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
+ wrapper1.eq(CouponMember::getDelFlag,0);
+ List<CouponMember> page1 = this.list(wrapper1);
+ return page1;
+ }
}
--
Gitblit v1.7.1