From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 c6e15d4..2860242 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
@@ -39,7 +39,7 @@
@Override
public PageDTO<CouponMemberVO> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
+ wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.ON_SHELVES);
wrapper.eq(Coupon::getDelFlag,0);
List<Coupon> couponMemberList=couponMapper.selectList(wrapper);
Set<Long> CouponList = null;
@@ -50,10 +50,10 @@
LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
if(couponMemberDTO.getCouponStatus()!=null){
wrapper1.eq(CouponMember::getCouponStatus,
- CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()+1));
+ CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()));
}
if (CouponList.size()>0){
- wrapper1.notIn(CouponMember::getCouponId,CouponList);
+ wrapper1.in(CouponMember::getCouponId,CouponList);
}
wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
wrapper1.eq(CouponMember::getDelFlag,0);
@@ -82,7 +82,7 @@
@Override
public List<CouponMemberVO> getCouponMemberl(CouponMemberDTO couponMemberDTO) {
LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
+ wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.ON_SHELVES);
wrapper.eq(Coupon::getDelFlag,0);
List<Coupon> couponMemberList=couponMapper.selectList(wrapper);
Set<Long> CouponList = null;
@@ -93,7 +93,7 @@
wrapper1.eq(CouponMember::getCouponStatus, 0);
wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
if (CouponList.size()>0){
- wrapper1.notIn(CouponMember::getCouponId,CouponList);
+ wrapper1.in(CouponMember::getCouponId,CouponList);
}
wrapper1.eq(CouponMember::getDelFlag,0);
List<CouponMember> page1 = this.list(wrapper1);
@@ -111,21 +111,19 @@
public List<CouponMemberVO> updCouponMember1(CouponMemberDTO couponMemberDTO) {
LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF);
+ wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.ON_SHELVES);
wrapper.eq(Coupon::getDelFlag,0);
List<Coupon> couponMemberList=couponMapper.selectList(wrapper);
Set<Long> CouponList = null;
CouponList = couponMemberList.stream().map(Coupon::getId)
.collect(Collectors.toSet());
-
LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(CouponMember::getCouponStatus,
- CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()));
- if (CouponList.size()>0){
- wrapper1.notIn(CouponMember::getCouponId,CouponList);
- }
+ wrapper1.eq(CouponMember::getCouponStatus, 0);
wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId());
+ if (CouponList.size()>0){
+ wrapper1.in(CouponMember::getCouponId,CouponList);
+ }
wrapper1.eq(CouponMember::getDelFlag,0);
List<CouponMember> page1 = this.list(wrapper1);
List<CouponMemberVO> couponMemberVOS=new ArrayList<>();
--
Gitblit v1.7.1