From 24790d669671fe79a856519c21b7e0ed9a42b558 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 06 Mar 2024 10:21:26 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 517e151..99f8e2d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -1067,7 +1067,8 @@
* 当前时间比结束时间大
*/
if(nowTime.compareTo(endTime) >= 0){
- List<MallProductBuyRecord> mallProductBuyRecords = mallProductBuyRecordMapper.selectByState(ProductEnum.PRODUCT_MATE_STATE_WAIT_PAY.getValue());
+ List<MallProductBuyRecord> mallProductBuyRecords = mallProductBuyRecordMapper.selectByState(
+ ProductEnum.PRODUCT_MATE_STATE_WAIT_PAY.getValue());
if(CollUtil.isNotEmpty(mallProductBuyRecords)){
for(MallProductBuyRecord mallProductBuyRecord : mallProductBuyRecords){
/**
@@ -1450,18 +1451,23 @@
TeamPerkDto teamPerkDto = JSONObject.parseObject(levelDic.getValue(), TeamPerkDto.class);
Integer directCntLevel = teamPerkDto.getDirectCnt();
Integer teamCnt = teamPerkDto.getTeamCnt();
- if(directCntLevel >= intersection.size() &&
- teamCnt >= mallMembersAll.size()){
- mallMemberRef.setLevel(level);
- memberMapper.updateById(mallMemberRef);
- flag = true;
- }
- String nextLevel = MemberLevelNewEnum.ZERO_LEVEL.getNextLevel(level);
- level = nextLevel;
- if(level.equals(MemberLevelNewEnum.WU_LEVEL.getType()) &&
- nextLevel.equals(MemberLevelNewEnum.WU_LEVEL.getType()) ){
- mallMemberRef.setLevel(level);
- memberMapper.updateById(mallMemberRef);
+ if(directCntLevel <= intersection.size()){
+ if(teamCnt <= mallMembersAll.size()){
+ mallMemberRef.setLevel(level);
+ memberMapper.updateById(mallMemberRef);
+
+ String nextLevel = MemberLevelNewEnum.ZERO_LEVEL.getNextLevel(level);
+ level = nextLevel;
+ if(level.equals(MemberLevelNewEnum.WU_LEVEL.getType()) &&
+ nextLevel.equals(MemberLevelNewEnum.WU_LEVEL.getType()) ){
+ mallMemberRef.setLevel(level);
+ memberMapper.updateById(mallMemberRef);
+ flag = true;
+ }
+ }else{
+ flag = true;
+ }
+ }else{
flag = true;
}
}
--
Gitblit v1.9.1