From 0bb46a371b4767c817653bb3af2da0bcd7349471 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 23 Feb 2024 14:41:42 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 29 ++++++++------
src/test/java/cc/mrbird/febs/ProfitTest.java | 37 ++++++++++--------
2 files changed, 38 insertions(+), 28 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..bfe07d6 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
@@ -1450,18 +1450,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;
}
}
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index f0519ec..77afc53 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -51,9 +51,9 @@
private DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Autowired
private MallProductBuyMapper mallProductBuyMapper;
- @Test
- public void dynamicProfit(){
-
+// @Test
+// public void dynamicProfit(){
+//
// QueryWrapper<MallProductBuy> query = new QueryWrapper<>();
// query.eq("state", ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
// query.eq("mate_state",ProductEnum.PRODUCT_BUY_MATE_STATE_FAIL.getValue());
@@ -103,23 +103,28 @@
// 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;
// }
// }
// }
- }
+// }
// @Autowired
// private AgentConsumer agentConsumer;
//
--
Gitblit v1.9.1