From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 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 52cb391..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
@@ -13,19 +13,14 @@
import com.ruoyi.promotion.mapper.CouponMapper;
import com.ruoyi.promotion.mapper.CouponMemberMapper;
import com.ruoyi.promotion.service.ICouponMemberService;
-import com.ruoyi.promotion.service.ICouponService;
import com.ruoyi.system.api.domain.CouponMember;
-import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
/**
* <p>
@@ -44,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;
@@ -55,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);
@@ -86,9 +81,8 @@
@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;
@@ -96,11 +90,10 @@
.collect(Collectors.toSet());
LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(CouponMember::getCouponStatus,
- CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus()+1));
+ 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);
@@ -118,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<>();
@@ -144,4 +135,9 @@
}
return couponMemberVOS;
}
+
+ @Override
+ public void timingCheckMemberCoupon() {
+ this.baseMapper.timingCheckMemberCoupon();
+ }
}
--
Gitblit v1.7.1