Skip to content

S
shop-Mall
Commit 96831c36 authored by licc's avatar licc
Browse files
Options

修改数据库密码

parent 16964532
Show whitespace changes
Inline Side-by-side
Showing with 93 additions and 97 deletions
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/DayTaskServiceImpl.java
View file @ 96831c36
...@@ -409,7 +409,8 @@ public class DayTaskServiceImpl implements DayTaskService { ...@@ -409,7 +409,8 @@ public class DayTaskServiceImpl implements DayTaskService {
growthRate = (month - last) / last; growthRate = (month - last) / last;
} }
} }
teamVo.setGrowthRate(growthRate); BigDecimal grow = new BigDecimal(growthRate).setScale(2, RoundingMode.HALF_UP);
teamVo.setGrowthRate(grow.doubleValue());
double monthPerformance; double monthPerformance;
assert teamPerformance != null; assert teamPerformance != null;
if (null == teamPerformance.getMonthTeamPerformance()) { if (null == teamPerformance.getMonthTeamPerformance()) {
......
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java
View file @ 96831c36
...@@ -13,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -13,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @author zw * @author zw
...@@ -53,25 +52,26 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -53,25 +52,26 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
private OrderMapper orderMapper; private OrderMapper orderMapper;
//系统推荐人邀请码 //系统推荐人邀请码
private static final String sysInviteCode1 = "1"; private static final String SYSINVITECODE1 = "1";
private static final String sysInviteCode2 = "88888888"; private static final String SYSINVITECODE2 = "88888888";
@Override @Override
@Transactional @Transactional
public void userLevelUpgrade(String userId) { public void userLevelUpgrade(String userId) {
log.info("--------------------当前用户id:"+userId); log.info("--------------------当前用户id:" + userId);
//当前用户对象 //当前用户对象
User user = usersMapper.getByUserId(userId); User user = usersMapper.getByUserId(userId);
//当前用户直推表对象 //当前用户直推表对象
RecommendUser recommendUser = recommendUserMapper.getByUserId(userId); RecommendUser recommendUser = recommendUserMapper.getByUserId(userId);
//当前用户团队信息表对象 //当前用户团队信息表对象
TeamUserInfo teamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(userId); TeamUserInfo teamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(userId);
//当前用户等级 //当前用户等级
Integer userLevel = user.getUserLevel(); int userLevel = user.getUserLevel();
log.info("---------------当前用户等级："+userLevel); log.info("---------------当前用户等级：" + userLevel);
//当前用户的累计消费 //当前用户的累计消费
BigDecimal performanceByUserid = new BigDecimal(0); BigDecimal performanceByUserid = new BigDecimal(0);
if (userLevel == 0){ if (userLevel == 0) {
//计算当前用户业绩 //计算当前用户业绩
performanceByUserid = orderMapper.getPerformanceByUserid(userId); performanceByUserid = orderMapper.getPerformanceByUserid(userId);
if (null == performanceByUserid) { if (null == performanceByUserid) {
...@@ -80,17 +80,17 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -80,17 +80,17 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
} }
//当前用户的推荐人邀请码 //当前用户的推荐人邀请码
String beInvitedCode = user.getBeInvitedCode(); String beInvitedCode = user.getBeInvitedCode();
log.info("--------------------当前用户的邀请码："+beInvitedCode); log.info("--------------------当前用户的邀请码：" + beInvitedCode);
String inviteUserId = ""; String inviteUserId = "";
RecommendUser inviteRecommendUser = new RecommendUser(); RecommendUser inviteRecommendUser = new RecommendUser();
//若当前用户的推荐人邀请码是 “1” 时 则当前用户没有邀请人 //若当前用户的推荐人邀请码是 “1” 时 则当前用户没有邀请人
if (!sysInviteCode1.equals(beInvitedCode) && !sysInviteCode2.equals(beInvitedCode)) { if (!SYSINVITECODE1.equals(beInvitedCode) && !SYSINVITECODE2.equals(beInvitedCode)) {
//通过当前用户推荐人邀请码获取邀请人的userId //通过当前用户推荐人邀请码获取邀请人的userId
User byBeInvitedCode = usersMapper.getByBeInvitedCode(beInvitedCode); User byBeInvitedCode = usersMapper.getByBeInvitedCode(beInvitedCode);
if (null != byBeInvitedCode) { if (null != byBeInvitedCode) {
inviteUserId = byBeInvitedCode.getUserId(); inviteUserId = byBeInvitedCode.getUserId();
log.info("-------------------推荐人userid"+inviteUserId); log.info("-------------------推荐人userid" + inviteUserId);
//邀请人的直推用户信息 //邀请人的直推用户信息
inviteRecommendUser = recommendUserMapper.getByUserId(inviteUserId); inviteRecommendUser = recommendUserMapper.getByUserId(inviteUserId);
} }
...@@ -104,7 +104,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -104,7 +104,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//同步accountInfo 和TeamPerformance 的用户等级 //同步accountInfo 和TeamPerformance 的用户等级
accountAndTeamPerformanceUserLevelUpdate(userId); accountAndTeamPerformanceUserLevelUpdate(userId);
//用户的推荐人邀请码为1或者88888888时 没有上级用户 //用户的推荐人邀请码为1或者88888888时 没有上级用户
if (sysInviteCode1.equals(beInvitedCode) || sysInviteCode2.equals(beInvitedCode)) { if (SYSINVITECODE1.equals(beInvitedCode) || SYSINVITECODE2.equals(beInvitedCode)) {
return; return;
} else { } else {
//推荐人直推信息表数据维护 //推荐人直推信息表数据维护
...@@ -138,7 +138,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -138,7 +138,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//同步accountInfo 和TeamPerformance 的用户等级 //同步accountInfo 和TeamPerformance 的用户等级
accountAndTeamPerformanceUserLevelUpdate(userId); accountAndTeamPerformanceUserLevelUpdate(userId);
//用户的推荐人邀请码为1或者88888888时 没有上级用户 //用户的推荐人邀请码为1或者88888888时 没有上级用户
if (sysInviteCode1.equals(beInvitedCode) || sysInviteCode2.equals(beInvitedCode)) { if (SYSINVITECODE1.equals(beInvitedCode) || SYSINVITECODE2.equals(beInvitedCode)) {
return; return;
} else { } else {
//若邀请人直推用户信息中的幼苗用户数量为0是则不用变化，否则幼苗用户数量-1 //若邀请人直推用户信息中的幼苗用户数量为0是则不用变化，否则幼苗用户数量-1
...@@ -168,7 +168,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -168,7 +168,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//同步accountInfo 和TeamPerformance 的用户等级 //同步accountInfo 和TeamPerformance 的用户等级
accountAndTeamPerformanceUserLevelUpdate(userId); accountAndTeamPerformanceUserLevelUpdate(userId);
////用户的推荐人邀请码为1或者88888888时 没有上级用户 ////用户的推荐人邀请码为1或者88888888时 没有上级用户
if (sysInviteCode1.equals(beInvitedCode) || sysInviteCode2.equals(beInvitedCode)) { if (SYSINVITECODE1.equals(beInvitedCode) || SYSINVITECODE2.equals(beInvitedCode)) {
return; return;
} else { } else {
//推荐人直推信息表数据维护 //推荐人直推信息表数据维护
...@@ -203,7 +203,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -203,7 +203,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//同步accountInfo 和TeamPerformance 的用户等级 //同步accountInfo 和TeamPerformance 的用户等级
accountAndTeamPerformanceUserLevelUpdate(userId); accountAndTeamPerformanceUserLevelUpdate(userId);
//用户的推荐人邀请码为1或者88888888时 没有上级用户 //用户的推荐人邀请码为1或者88888888时 没有上级用户
if (sysInviteCode1.equals(beInvitedCode) || sysInviteCode2.equals(beInvitedCode)) { if (SYSINVITECODE1.equals(beInvitedCode) || SYSINVITECODE2.equals(beInvitedCode)) {
return; return;
} else { } else {
//推荐人直推信息表数据维护 //推荐人直推信息表数据维护
...@@ -230,14 +230,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -230,14 +230,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//:todo 条件:团队中白银树数量>=40 //:todo 条件:团队中白银树数量>=40
if (userLevel == 4 && recommendUser.getSeedlingNum() >= 30 if (userLevel == 4 && recommendUser.getSeedlingNum() >= 30
&& recommendUser.getGoldTreeNum() >= 2 && recommendUser.getGoldTreeNum() >= 2
&& teamUserInfoMapperByUserId.getSeedlingNum() >=70 && teamUserInfoMapperByUserId.getSeedlingNum() >= 70
&& teamUserInfoMapperByUserId.getSilverTreeNum() >= 40) { && teamUserInfoMapperByUserId.getSilverTreeNum() >= 40) {
user.setUserLevel(5); user.setUserLevel(5);
usersMapper.updateById(user); usersMapper.updateById(user);
//同步accountInfo 和TeamPerformance 的用户等级 //同步accountInfo 和TeamPerformance 的用户等级
accountAndTeamPerformanceUserLevelUpdate(userId); accountAndTeamPerformanceUserLevelUpdate(userId);
////用户的推荐人邀请码为1或者88888888时 没有上级用户 ////用户的推荐人邀请码为1或者88888888时 没有上级用户
if (sysInviteCode1.equals(beInvitedCode) || sysInviteCode2.equals(beInvitedCode)) { if (SYSINVITECODE1.equals(beInvitedCode) || SYSINVITECODE2.equals(beInvitedCode)) {
return; return;
} else { } else {
//推荐人直推信息表数据维护 //推荐人直推信息表数据维护
...@@ -264,7 +264,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -264,7 +264,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//用户等级升级为森林之星 6 //用户等级升级为森林之星 6
if (userLevel == 5 && recommendUser.getSeedlingNum() >= 40 if (userLevel == 5 && recommendUser.getSeedlingNum() >= 40
&& recommendUser.getFarmerNum() >= 2 && recommendUser.getFarmerNum() >= 2
&& teamUserInfoMapperByUserId.getSeedlingNum() >=80 && teamUserInfoMapperByUserId.getSeedlingNum() >= 80
&& teamUserInfoMapperByUserId.getSilverTreeNum() >= 70 && teamUserInfoMapperByUserId.getSilverTreeNum() >= 70
&& teamUserInfoMapperByUserId.getGoldTreeNum() >= 30) { && teamUserInfoMapperByUserId.getGoldTreeNum() >= 30) {
user.setUserLevel(6); user.setUserLevel(6);
...@@ -272,7 +272,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -272,7 +272,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//同步accountInfo 和TeamPerformance 的用户等级 //同步accountInfo 和TeamPerformance 的用户等级
accountAndTeamPerformanceUserLevelUpdate(userId); accountAndTeamPerformanceUserLevelUpdate(userId);
//用户的推荐人邀请码为1或者88888888时 没有上级用户 //用户的推荐人邀请码为1或者88888888时 没有上级用户
if (sysInviteCode1.equals(beInvitedCode) || sysInviteCode2.equals(beInvitedCode)) { if (SYSINVITECODE1.equals(beInvitedCode) || SYSINVITECODE2.equals(beInvitedCode)) {
return; return;
} else { } else {
//推荐人直推信息表数据维护 //推荐人直推信息表数据维护
...@@ -308,7 +308,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -308,7 +308,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//同步accountInfo 和TeamPerformance 的用户等级 //同步accountInfo 和TeamPerformance 的用户等级
accountAndTeamPerformanceUserLevelUpdate(userId); accountAndTeamPerformanceUserLevelUpdate(userId);
//用户的推荐人邀请码为1或者88888888时 没有上级用户 //用户的推荐人邀请码为1或者88888888时 没有上级用户
if (sysInviteCode1.equals(beInvitedCode) || sysInviteCode2.equals(beInvitedCode)) { if (SYSINVITECODE1.equals(beInvitedCode) || SYSINVITECODE2.equals(beInvitedCode)) {
return; return;
} else { } else {
//推荐人直推信息表数据维护 //推荐人直推信息表数据维护
...@@ -339,7 +339,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -339,7 +339,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
* @param inviteUserId 邀请人userid * @param inviteUserId 邀请人userid
*/ */
private void teamUserInfoForestStartToPartner(String inviteUserId) { private void teamUserInfoForestStartToPartner(String inviteUserId) {
if (!"".equals(inviteUserId)){ if (!"".equals(inviteUserId)) {
//邀请人的团队信息表对象 //邀请人的团队信息表对象
TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId); TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId);
...@@ -348,7 +348,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -348,7 +348,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
String beinvitedCodeUserId = ""; String beinvitedCodeUserId = "";
String inviteCode = byUserId.getBeInvitedCode(); String inviteCode = byUserId.getBeInvitedCode();
if (!sysInviteCode1.equals(inviteUserId) && !sysInviteCode2.equals(inviteUserId)) { if (!SYSINVITECODE1.equals(inviteUserId) && !SYSINVITECODE2.equals(inviteUserId)) {
//通过邀请人的用户信息获取邀请人的推荐人邀请码 //通过邀请人的用户信息获取邀请人的推荐人邀请码
beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId(); beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId();
} }
...@@ -364,10 +364,10 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -364,10 +364,10 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//西田森合伙人用户数量 + 1 //西田森合伙人用户数量 + 1
teamNumInfoBuyId.setPartnerNum(teamNumInfoBuyId.getPartnerNum() + 1); teamNumInfoBuyId.setPartnerNum(teamNumInfoBuyId.getPartnerNum() + 1);
teamUserInfoMapper.updateById(teamNumInfoBuyId); teamUserInfoMapper.updateById(teamNumInfoBuyId);
if (sysInviteCode1.equals(inviteUserId) || sysInviteCode2.equals(inviteUserId)) { if (SYSINVITECODE1.equals(inviteUserId) || SYSINVITECODE2.equals(inviteUserId)) {
return; return;
} }
if ("".equals(beinvitedCodeUserId)){ if ("".equals(beinvitedCodeUserId)) {
teamUserInfoForestStartToPartner(beinvitedCodeUserId); teamUserInfoForestStartToPartner(beinvitedCodeUserId);
} }
...@@ -380,7 +380,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -380,7 +380,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
* @param inviteUserId 邀请人userid * @param inviteUserId 邀请人userid
*/ */
private void teamUserInfoFarmerToForestStart(String inviteUserId) { private void teamUserInfoFarmerToForestStart(String inviteUserId) {
if (!"".equals(inviteUserId)){ if (!"".equals(inviteUserId)) {
//邀请人的团队信息表对象 //邀请人的团队信息表对象
TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId); TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId);
...@@ -389,7 +389,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -389,7 +389,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
String beinvitedCodeUserId = ""; String beinvitedCodeUserId = "";
String inviteCode = byUserId.getBeInvitedCode(); String inviteCode = byUserId.getBeInvitedCode();
if (!sysInviteCode1.equals(inviteUserId) && !sysInviteCode2.equals(inviteUserId)) { if (!SYSINVITECODE1.equals(inviteUserId) && !SYSINVITECODE2.equals(inviteUserId)) {
//通过邀请人的用户信息获取邀请人的推荐人邀请码 //通过邀请人的用户信息获取邀请人的推荐人邀请码
beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId(); beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId();
} }
...@@ -405,11 +405,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -405,11 +405,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//森林之星用户数量 + 1 //森林之星用户数量 + 1
teamNumInfoBuyId.setForestStartNum(teamNumInfoBuyId.getForestStartNum() + 1); teamNumInfoBuyId.setForestStartNum(teamNumInfoBuyId.getForestStartNum() + 1);
teamUserInfoMapper.updateById(teamNumInfoBuyId); teamUserInfoMapper.updateById(teamNumInfoBuyId);
if (sysInviteCode1.equals(inviteUserId) || sysInviteCode2.equals(inviteUserId)) { if (SYSINVITECODE1.equals(inviteUserId) || SYSINVITECODE2.equals(inviteUserId)) {
return; return;
} }
//递归向上修改团队用户信息表 //递归向上修改团队用户信息表
if ("".equals(beinvitedCodeUserId)){ if ("".equals(beinvitedCodeUserId)) {
teamUserInfoFarmerToForestStart(beinvitedCodeUserId); teamUserInfoFarmerToForestStart(beinvitedCodeUserId);
} }
...@@ -422,7 +422,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -422,7 +422,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
* @param inviteUserId 邀请人userid * @param inviteUserId 邀请人userid
*/ */
private void teamUserInfoGoldTreeToFarmer(String inviteUserId) { private void teamUserInfoGoldTreeToFarmer(String inviteUserId) {
if (!"".equals(inviteUserId)){ if (!"".equals(inviteUserId)) {
//邀请人的团队信息表对象 //邀请人的团队信息表对象
TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId); TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId);
...@@ -431,7 +431,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -431,7 +431,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
String beinvitedCodeUserId = ""; String beinvitedCodeUserId = "";
String inviteCode = byUserId.getBeInvitedCode(); String inviteCode = byUserId.getBeInvitedCode();
if (!sysInviteCode1.equals(inviteUserId) && !sysInviteCode2.equals(inviteUserId)) { if (!SYSINVITECODE1.equals(inviteUserId) && !SYSINVITECODE2.equals(inviteUserId)) {
//通过邀请人的用户信息获取邀请人的推荐人邀请码 //通过邀请人的用户信息获取邀请人的推荐人邀请码
beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId(); beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId();
} }
...@@ -447,11 +447,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -447,11 +447,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//农场主数量 + 1 //农场主数量 + 1
teamNumInfoBuyId.setFarmerNum(teamNumInfoBuyId.getFarmerNum() + 1); teamNumInfoBuyId.setFarmerNum(teamNumInfoBuyId.getFarmerNum() + 1);
teamUserInfoMapper.updateById(teamNumInfoBuyId); teamUserInfoMapper.updateById(teamNumInfoBuyId);
if (sysInviteCode1.equals(inviteUserId) || sysInviteCode2.equals(inviteUserId)) { if (SYSINVITECODE1.equals(inviteUserId) || SYSINVITECODE2.equals(inviteUserId)) {
return; return;
} }
//递归向上修改团队用户信息表 //递归向上修改团队用户信息表
if ("".equals(beinvitedCodeUserId)){ if ("".equals(beinvitedCodeUserId)) {
teamUserInfoGoldTreeToFarmer(beinvitedCodeUserId); teamUserInfoGoldTreeToFarmer(beinvitedCodeUserId);
} }
...@@ -464,7 +464,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -464,7 +464,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
* @param inviteUserId 邀请人userid * @param inviteUserId 邀请人userid
*/ */
private void teamUserInfoSilverToGoldTree(String inviteUserId) { private void teamUserInfoSilverToGoldTree(String inviteUserId) {
if(!"".equals(inviteUserId)){ if (!"".equals(inviteUserId)) {
//邀请人的团队信息表对象 //邀请人的团队信息表对象
TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId); TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId);
...@@ -473,7 +473,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -473,7 +473,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
String beinvitedCodeUserId = ""; String beinvitedCodeUserId = "";
String inviteCode = byUserId.getBeInvitedCode(); String inviteCode = byUserId.getBeInvitedCode();
if (!sysInviteCode1.equals(inviteUserId) && !sysInviteCode2.equals(inviteUserId)) { if (!SYSINVITECODE1.equals(inviteUserId) && !SYSINVITECODE2.equals(inviteUserId)) {
//通过邀请人的用户信息获取邀请人的推荐人邀请码 //通过邀请人的用户信息获取邀请人的推荐人邀请码
beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId(); beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId();
} }
...@@ -489,11 +489,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -489,11 +489,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//黄金树用户数量 - 1 //黄金树用户数量 - 1
teamNumInfoBuyId.setGoldTreeNum(teamNumInfoBuyId.getGoldTreeNum() + 1); teamNumInfoBuyId.setGoldTreeNum(teamNumInfoBuyId.getGoldTreeNum() + 1);
teamUserInfoMapper.updateById(teamNumInfoBuyId); teamUserInfoMapper.updateById(teamNumInfoBuyId);
if (sysInviteCode1.equals(inviteUserId) || sysInviteCode2.equals(inviteUserId)) { if (SYSINVITECODE1.equals(inviteUserId) || SYSINVITECODE2.equals(inviteUserId)) {
return; return;
} }
//递归向上修改团队用户信息表 //递归向上修改团队用户信息表
if ("".equals(beinvitedCodeUserId)){ if ("".equals(beinvitedCodeUserId)) {
teamUserInfoSilverToGoldTree(beinvitedCodeUserId); teamUserInfoSilverToGoldTree(beinvitedCodeUserId);
} }
...@@ -506,7 +506,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -506,7 +506,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
* @param inviteUserId 邀请人userid * @param inviteUserId 邀请人userid
*/ */
private void teamUserInfoBronzeToSilver(String inviteUserId) { private void teamUserInfoBronzeToSilver(String inviteUserId) {
if (!"".equals(inviteUserId)){ if (!"".equals(inviteUserId)) {
//邀请人的团队信息表对象 //邀请人的团队信息表对象
TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId); TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId);
...@@ -515,7 +515,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -515,7 +515,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
String beinvitedCodeUserId = ""; String beinvitedCodeUserId = "";
String inviteCode = byUserId.getBeInvitedCode(); String inviteCode = byUserId.getBeInvitedCode();
if (!sysInviteCode1.equals(inviteUserId) && !sysInviteCode2.equals(inviteUserId)) { if (!SYSINVITECODE1.equals(inviteUserId) && !SYSINVITECODE2.equals(inviteUserId)) {
//通过邀请人的用户信息获取邀请人的推荐人邀请码 //通过邀请人的用户信息获取邀请人的推荐人邀请码
beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId(); beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId();
} }
...@@ -531,11 +531,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -531,11 +531,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//白银树用户数量+1 //白银树用户数量+1
teamNumInfoBuyId.setSilverTreeNum(teamNumInfoBuyId.getSilverTreeNum() + 1); teamNumInfoBuyId.setSilverTreeNum(teamNumInfoBuyId.getSilverTreeNum() + 1);
teamUserInfoMapper.updateById(teamNumInfoBuyId); teamUserInfoMapper.updateById(teamNumInfoBuyId);
if (sysInviteCode1.equals(inviteUserId) || sysInviteCode2.equals(inviteUserId)) { if (SYSINVITECODE1.equals(inviteUserId) || SYSINVITECODE2.equals(inviteUserId)) {
return; return;
} }
//递归向上修改团队用户信息表 //递归向上修改团队用户信息表
if ("".equals(beinvitedCodeUserId)){ if ("".equals(beinvitedCodeUserId)) {
teamUserInfoBronzeToSilver(beinvitedCodeUserId); teamUserInfoBronzeToSilver(beinvitedCodeUserId);
} }
...@@ -548,7 +548,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -548,7 +548,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
* @param inviteUserId 邀请人userid * @param inviteUserId 邀请人userid
*/ */
private void teamUserInfoSeedToBronze(String inviteUserId) { private void teamUserInfoSeedToBronze(String inviteUserId) {
if (!"".equals(inviteUserId)){ if (!"".equals(inviteUserId)) {
//邀请人的团队信息表对象 //邀请人的团队信息表对象
TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId); TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId);
...@@ -557,7 +557,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -557,7 +557,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
String beinvitedCodeUserId = ""; String beinvitedCodeUserId = "";
String inviteCode = byUserId.getBeInvitedCode(); String inviteCode = byUserId.getBeInvitedCode();
if (!sysInviteCode1.equals(inviteUserId) && !sysInviteCode2.equals(inviteUserId)) { if (!SYSINVITECODE1.equals(inviteUserId) && !SYSINVITECODE2.equals(inviteUserId)) {
//通过邀请人的用户信息获取邀请人的推荐人邀请码 //通过邀请人的用户信息获取邀请人的推荐人邀请码
beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId(); beinvitedCodeUserId = usersMapper.getByBeInvitedCode(inviteCode).getUserId();
} }
...@@ -573,11 +573,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -573,11 +573,11 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//邀请人的团队用户信息表中青铜树数量 + 1 //邀请人的团队用户信息表中青铜树数量 + 1
teamNumInfoBuyId.setBronzeTreeNum(teamNumInfoBuyId.getBronzeTreeNum() + 1); teamNumInfoBuyId.setBronzeTreeNum(teamNumInfoBuyId.getBronzeTreeNum() + 1);
teamUserInfoMapper.updateById(teamNumInfoBuyId); teamUserInfoMapper.updateById(teamNumInfoBuyId);
if (sysInviteCode1.equals(inviteUserId) || sysInviteCode2.equals(inviteUserId)) { if (SYSINVITECODE1.equals(inviteUserId) || SYSINVITECODE2.equals(inviteUserId)) {
return; return;
} }
//递归向上修改团队用户信息表 //递归向上修改团队用户信息表
if ("".equals(beinvitedCodeUserId)){ if ("".equals(beinvitedCodeUserId)) {
teamUserInfoSeedToBronze(beinvitedCodeUserId); teamUserInfoSeedToBronze(beinvitedCodeUserId);
} }
...@@ -590,7 +590,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -590,7 +590,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
* @param inviteUserId 邀请人userid * @param inviteUserId 邀请人userid
*/ */
private void teamUserInfoNormalToSeed(String inviteUserId) { private void teamUserInfoNormalToSeed(String inviteUserId) {
if (!"".equals(inviteUserId)){ if (!"".equals(inviteUserId)) {
//邀请人的团队信息表对象 //邀请人的团队信息表对象
TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId); TeamUserInfo teamNumInfoBuyId = teamUserInfoMapper.getByUserId(inviteUserId);
...@@ -600,7 +600,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -600,7 +600,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
String beinvitedCodeUserId = ""; String beinvitedCodeUserId = "";
//邀请人的推荐人邀请码 //邀请人的推荐人邀请码
String inviteCode = intiveUserByUserId.getBeInvitedCode(); String inviteCode = intiveUserByUserId.getBeInvitedCode();
if (!sysInviteCode1.equals(inviteUserId) && !sysInviteCode2.equals(inviteUserId)) { if (!SYSINVITECODE1.equals(inviteUserId) && !SYSINVITECODE2.equals(inviteUserId)) {
//通过邀请人的用户信息获取邀请人的推荐人邀请码 //通过邀请人的用户信息获取邀请人的推荐人邀请码
User byBeInvitedCode = usersMapper.getByBeInvitedCode(inviteCode); User byBeInvitedCode = usersMapper.getByBeInvitedCode(inviteCode);
if (null != byBeInvitedCode) { if (null != byBeInvitedCode) {
...@@ -617,7 +617,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -617,7 +617,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//第一波用户是谁邀请的 //第一波用户是谁邀请的
teamNumInfoBuyId.setSeedlingNum(teamNumInfoBuyId.getSeedlingNum() + 1); teamNumInfoBuyId.setSeedlingNum(teamNumInfoBuyId.getSeedlingNum() + 1);
teamUserInfoMapper.updateById(teamNumInfoBuyId); teamUserInfoMapper.updateById(teamNumInfoBuyId);
if (sysInviteCode1.equals(inviteUserId) || sysInviteCode2.equals(inviteUserId)) { if (SYSINVITECODE1.equals(inviteUserId) || SYSINVITECODE2.equals(inviteUserId)) {
return; return;
} }
//递归向上修改团队用户信息表 //递归向上修改团队用户信息表
...@@ -663,14 +663,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -663,14 +663,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
cultivatingPrizeInfo.setSeedling(seedling); cultivatingPrizeInfo.setSeedling(seedling);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加 //账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize); accountAddEarningsTotalAndEarningsMonth(inviteUserId, cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+seedling); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + seedling);
} else { } else {
//3.修改培育奖记录状态 ==2 //3.修改培育奖记录状态 ==2
seedling = 2; seedling = 2;
cultivatingPrizeInfo.setSeedling(seedling); cultivatingPrizeInfo.setSeedling(seedling);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
log.info("用户"+inviteUserId +"获得"+ "培育奖来自---用户id"+userId+"userlevel"+level+"status:"+seedling); log.info("用户" + inviteUserId + "获得" + "培育奖来自---用户id" + userId + "userlevel" + level + "status:" + seedling);
} }
} }
...@@ -701,14 +701,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -701,14 +701,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
cultivatingPrizeInfo.setBronzeTree(bronzeTree); cultivatingPrizeInfo.setBronzeTree(bronzeTree);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加 //账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize); accountAddEarningsTotalAndEarningsMonth(inviteUserId, cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+bronzeTree); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + bronzeTree);
} else { } else {
//3.修改培育奖记录状态 ==2 //3.修改培育奖记录状态 ==2
bronzeTree = 2; bronzeTree = 2;
cultivatingPrizeInfo.setBronzeTree(bronzeTree); cultivatingPrizeInfo.setBronzeTree(bronzeTree);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+bronzeTree); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + bronzeTree);
} }
} }
...@@ -739,14 +739,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -739,14 +739,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
cultivatingPrizeInfo.setBronzeTree(silverTree); cultivatingPrizeInfo.setBronzeTree(silverTree);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加 //账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize); accountAddEarningsTotalAndEarningsMonth(inviteUserId, cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+silverTree); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + silverTree);
} else { } else {
//3.修改培育奖记录状态 ==2 //3.修改培育奖记录状态 ==2
silverTree = 2; silverTree = 2;
cultivatingPrizeInfo.setBronzeTree(silverTree); cultivatingPrizeInfo.setBronzeTree(silverTree);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+silverTree); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + silverTree);
} }
} }
} }
...@@ -760,7 +760,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -760,7 +760,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
User inviteUser = usersMapper.getByUserId(inviteUserId); User inviteUser = usersMapper.getByUserId(inviteUserId);
if (null != inviteUser) { if (null != inviteUser) {
int userLevel = inviteUser.getUserLevel(); int userLevel = inviteUser.getUserLevel();
if (userLevel >= level ){ if (userLevel >= level) {
//2.交易流水新增一条数据 //2.交易流水新增一条数据
TradeRecord tradeRecord = new TradeRecord(); TradeRecord tradeRecord = new TradeRecord();
...@@ -776,14 +776,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -776,14 +776,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
cultivatingPrizeInfo.setGoldTree(goldTree); cultivatingPrizeInfo.setGoldTree(goldTree);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加 //账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize); accountAddEarningsTotalAndEarningsMonth(inviteUserId, cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+goldTree); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + goldTree);
}else { } else {
//3.修改培育奖记录状态 ==2 //3.修改培育奖记录状态 ==2
goldTree = 2; goldTree = 2;
cultivatingPrizeInfo.setGoldTree(goldTree); cultivatingPrizeInfo.setGoldTree(goldTree);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+goldTree); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + goldTree);
} }
} }
} }
...@@ -797,7 +797,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -797,7 +797,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
User inviteUser = usersMapper.getByUserId(inviteUserId); User inviteUser = usersMapper.getByUserId(inviteUserId);
if (null != inviteUser) { if (null != inviteUser) {
int userLevel = inviteUser.getUserLevel(); int userLevel = inviteUser.getUserLevel();
if (userLevel >= level){ if (userLevel >= level) {
//2.交易流水新增一条数据 //2.交易流水新增一条数据
TradeRecord tradeRecord = new TradeRecord(); TradeRecord tradeRecord = new TradeRecord();
...@@ -813,14 +813,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -813,14 +813,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
cultivatingPrizeInfo.setGoldTree(farmer); cultivatingPrizeInfo.setGoldTree(farmer);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加 //账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize); accountAddEarningsTotalAndEarningsMonth(inviteUserId, cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+farmer); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + farmer);
}else { } else {
//3.修改培育奖记录状态 ==2 //3.修改培育奖记录状态 ==2
farmer = 2; farmer = 2;
cultivatingPrizeInfo.setGoldTree(farmer); cultivatingPrizeInfo.setGoldTree(farmer);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+farmer); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + farmer);
} }
} }
} }
...@@ -834,7 +834,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -834,7 +834,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
User inviteUser = usersMapper.getByUserId(inviteUserId); User inviteUser = usersMapper.getByUserId(inviteUserId);
if (null != inviteUser) { if (null != inviteUser) {
int userLevel = inviteUser.getUserLevel(); int userLevel = inviteUser.getUserLevel();
if (userLevel >= level){ if (userLevel >= level) {
//2.交易流水新增一条数据 //2.交易流水新增一条数据
TradeRecord tradeRecord = new TradeRecord(); TradeRecord tradeRecord = new TradeRecord();
...@@ -850,14 +850,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -850,14 +850,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
cultivatingPrizeInfo.setGoldTree(forestStart); cultivatingPrizeInfo.setGoldTree(forestStart);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加 //账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize); accountAddEarningsTotalAndEarningsMonth(inviteUserId, cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+forestStart); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + forestStart);
}else { } else {
//3.修改培育奖记录状态 ==2 //3.修改培育奖记录状态 ==2
forestStart = 2; forestStart = 2;
cultivatingPrizeInfo.setGoldTree(forestStart); cultivatingPrizeInfo.setGoldTree(forestStart);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+forestStart); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + forestStart);
} }
} }
} }
...@@ -871,7 +871,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -871,7 +871,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
User inviteUser = usersMapper.getByUserId(inviteUserId); User inviteUser = usersMapper.getByUserId(inviteUserId);
if (null != inviteUser) { if (null != inviteUser) {
int userLevel = inviteUser.getUserLevel(); int userLevel = inviteUser.getUserLevel();
if (userLevel >= level){ if (userLevel >= level) {
//2.交易流水新增一条数据 //2.交易流水新增一条数据
TradeRecord tradeRecord = new TradeRecord(); TradeRecord tradeRecord = new TradeRecord();
...@@ -887,14 +887,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -887,14 +887,14 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
cultivatingPrizeInfo.setGoldTree(partner); cultivatingPrizeInfo.setGoldTree(partner);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加 //账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize); accountAddEarningsTotalAndEarningsMonth(inviteUserId, cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+partner); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + partner);
}else { } else {
//3.修改培育奖记录状态 ==2 //3.修改培育奖记录状态 ==2
partner = 2; partner = 2;
cultivatingPrizeInfo.setGoldTree(partner); cultivatingPrizeInfo.setGoldTree(partner);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo); cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+partner); log.info("用户:" + inviteUserId + "获得" + "培育奖来自---用户id:" + userId + "userlevel:" + level + "status:" + partner);
} }
} }
} }
...@@ -903,26 +903,26 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -903,26 +903,26 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//同步accountInfo 和TeamPerformance 的用户等级 //同步accountInfo 和TeamPerformance 的用户等级
@Override @Override
public void accountAndTeamPerformanceUserLevelUpdate(String userId){ public void accountAndTeamPerformanceUserLevelUpdate(String userId) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM");
String format = dateFormat.format(new Date()); String format = dateFormat.format(new Date());
User userByUserId = usersMapper.getUserByUserId(userId); User userByUserId = usersMapper.getUserByUserId(userId);
if (null != userByUserId){ if (null != userByUserId) {
int userLevel = userByUserId.getUserLevel(); int userLevel = userByUserId.getUserLevel();
AccountInfo accountInfoByUserId = accountMapper.getByUserId(userId); AccountInfo accountInfoByUserId = accountMapper.getByUserId(userId);
accountInfoByUserId.setUserLevel(userLevel); accountInfoByUserId.setUserLevel(userLevel);
TeamPerformance teamPerformanceByUserId = teamPerformanceMapper.getByUserIdAndTime(userId,format); TeamPerformance teamPerformanceByUserId = teamPerformanceMapper.getByUserIdAndTime(userId, format);
if(null == teamPerformanceByUserId){ if (null == teamPerformanceByUserId) {
TeamPerformance teamPerformance = new TeamPerformance(); TeamPerformance teamPerformance = new TeamPerformance();
teamPerformance.setUserId(userId); teamPerformance.setUserId(userId);
teamPerformance.setUserLevel(userLevel); teamPerformance.setUserLevel(userLevel);
teamPerformance.setYearMonth(format); teamPerformance.setYearMonth(format);
teamPerformance.setMonthTeamPerformance(new BigDecimal(0)); teamPerformance.setMonthTeamPerformance(new BigDecimal(0));
teamPerformanceMapper.add(teamPerformance); teamPerformanceMapper.add(teamPerformance);
}else { } else {
teamPerformanceByUserId.setUserLevel(userLevel); teamPerformanceByUserId.setUserLevel(userLevel);
teamPerformanceMapper.edit(teamPerformanceByUserId); teamPerformanceMapper.edit(teamPerformanceByUserId);
} }
...@@ -935,9 +935,10 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme ...@@ -935,9 +935,10 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
* 用户获得培育奖之后 * 用户获得培育奖之后
* 进行账户表累加操作 * 进行账户表累加操作
* 当月收益和累计收益 * 当月收益和累计收益
*
* @param userId * @param userId
*/ */
public void accountAddEarningsTotalAndEarningsMonth(String userId , BigDecimal cultivatingPrize){ public void accountAddEarningsTotalAndEarningsMonth(String userId, BigDecimal cultivatingPrize) {
AccountInfo accountMapperByUserId = accountMapper.getByUserId(userId); AccountInfo accountMapperByUserId = accountMapper.getByUserId(userId);
BigDecimal earningsMonth = accountMapperByUserId.getEarningsMonth(); BigDecimal earningsMonth = accountMapperByUserId.getEarningsMonth();
BigDecimal earningsTotal = accountMapperByUserId.getEarningsTotal(); BigDecimal earningsTotal = accountMapperByUserId.getEarningsTotal();
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLevelController.java
View file @ 96831c36
...@@ -126,10 +126,4 @@ public class UserLevelController { ...@@ -126,10 +126,4 @@ public class UserLevelController {
recommendUserService.clearMonthCount(); recommendUserService.clearMonthCount();
} }
// @ApiOperation(value = "订单测试用户直推的当月收益累加", notes = "订单测试用户直推的当月收益累加", httpMethod = "GET")
// @GetMapping("/jsonOrder")
// public void jsonOrder() throws IOException {
//
// orderService.orderJSON();
// }
} }
wisenergy-web-admin/src/main/resources/application-dev.yml
View file @ 96831c36
...@@ -18,7 +18,7 @@ spring: ...@@ -18,7 +18,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://8.131.244.76:3306/shop-mall?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8 url: jdbc:mysql://8.131.244.76:3306/shop-mall?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root username: root
password: PRMHmHBr password: qzh@xitiansen
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
......
wisenergy-web-admin/src/main/resources/application-prod.yml
View file @ 96831c36
...@@ -3,9 +3,9 @@ spring: ...@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
druid: druid:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/shop-mall?useUnicode=true&serverTimezone=GMT%2B8 url: jdbc:mysql://8.140.108.250:3306/shop-mall?useUnicode=true&serverTimezone=GMT%2B8
username: xitiansen username: xitiansen
password: RmRDH8xCxDjDjxM5 password: adm4HYservice
initial-size: 10 initial-size: 10
max-active: 100 max-active: 100
min-idle: 10 min-idle: 10
...@@ -36,7 +36,7 @@ spring: ...@@ -36,7 +36,7 @@ spring:
redis: redis:
open: false # 是否开启redis缓存 true开启 false关闭 open: false # 是否开启redis缓存 true开启 false关闭
database: 0 database: 0
host: 127.0.0.1 host: 8.140.108.250
port: 6379 port: 6379
password: 1qaz@WSX password: 1qaz@WSX
timeout: 6000ms timeout: 6000ms
......
wisenergy-web-admin/src/main/resources/application.yml
View file @ 96831c36
...@@ -8,7 +8,7 @@ server: ...@@ -8,7 +8,7 @@ server:
max-http-form-post-size: 1024MB max-http-form-post-size: 1024MB
# 1 073 741 824 # 1 073 741 824
port: 8997 port: 81
servlet: servlet:
context-path: /shop-mall context-path: /shop-mall
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment