修改邀请信息接口
This commit is contained in:
@@ -57,4 +57,7 @@ public class UserMoney implements Serializable {
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long sysUserId;
|
||||
|
||||
private BigDecimal inviteIncomeMoney;;
|
||||
private BigDecimal inviteIncomeCoin;
|
||||
|
||||
}
|
||||
|
||||
@@ -16,5 +16,4 @@ public interface UserMoneyService extends IService<UserMoney> {
|
||||
void updateSysMoney(int i, Long userId, double money);
|
||||
|
||||
void updateSysAmount(int i, Long userId, double amount);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.sqx.modules.app.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
@@ -7,6 +8,7 @@ import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.dao.UserMoneyDetailsDao;
|
||||
import com.sqx.modules.app.entity.UserMoney;
|
||||
import com.sqx.modules.app.entity.UserMoneyDetails;
|
||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -58,6 +60,7 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
|
||||
Double inviteMoney = baseMapper.queryUserInviteMoney(userId);
|
||||
Double inviteGoldMoney = baseMapper.queryUserInviteGoldMoney(userId);
|
||||
|
||||
|
||||
Map<String, Double> map = new HashMap<>(2);
|
||||
map.put("inviteMoney", inviteMoney == null ? 0 : inviteMoney);
|
||||
map.put("inviteGoldMoney", inviteGoldMoney == null ? 0 : inviteGoldMoney);
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package com.sqx.modules.invite.controller.app;
|
||||
|
||||
|
||||
import cn.hutool.core.map.MapBuilder;
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
import cn.hutool.extra.qrcode.QrCodeUtil;
|
||||
import cn.hutool.extra.qrcode.QrConfig;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
@@ -13,6 +15,7 @@ import com.sqx.modules.app.annotation.Login;
|
||||
import com.sqx.modules.app.annotation.LoginUser;
|
||||
import com.sqx.modules.app.entity.InviteAchievement;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
import com.sqx.modules.app.entity.UserMoney;
|
||||
import com.sqx.modules.app.service.InviteAchievementService;
|
||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||
import com.sqx.modules.app.service.UserMoneyService;
|
||||
@@ -114,12 +117,13 @@ public class AppInviteController {
|
||||
// Integer inviteSignCount = inviteService.selectInviteSignCount(userEntity.getInvitationCode());
|
||||
int inviteSignCount = inviteAchievementService.count(new LambdaQueryWrapper<InviteAchievement>().eq(InviteAchievement::getState, 1)
|
||||
.eq(InviteAchievement::getUserId, userId));
|
||||
Map<String, Double> earningMap = userMoneyDetailsService.queryUserTotalEarning(userId);
|
||||
UserMoney userMoney = userMoneyService.getOne(new LambdaQueryWrapper<UserMoney>().eq(UserMoney::getUserId, userId));
|
||||
// Map<String, Double> earningMap = userMoneyDetailsService.queryUserTotalEarning(userId);
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
result.put("inviteMoney", inviteMoney);
|
||||
result.put("inviteCount", inviteCount);
|
||||
result.put("inviteSignCount", inviteSignCount);
|
||||
result.put("earning", earningMap);
|
||||
result.put("earning", MapUtil.builder().put("inviteMoney", userMoney == null ? null :userMoney.getInviteIncomeMoney()).put("inviteGoldMoney", userMoney.getInviteIncomeCoin()));
|
||||
return Result.success().put("data", result);
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.common.utils.DateUtils;
|
||||
import com.sqx.modules.app.entity.InviteAchievement;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
import com.sqx.modules.app.entity.UserMoney;
|
||||
import com.sqx.modules.app.entity.UserMoneyDetails;
|
||||
import com.sqx.modules.app.service.InviteAchievementService;
|
||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||
@@ -207,6 +208,9 @@ public class TempOrdersTask {
|
||||
return;
|
||||
}
|
||||
InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId());
|
||||
|
||||
BigDecimal incomeMoney = new BigDecimal(0);
|
||||
BigDecimal incomeCoin = new BigDecimal(0);
|
||||
// 首次达标
|
||||
int signCount = Integer.parseInt(commonRepository.findOne(913).getValue());
|
||||
logger.info("{}签到次数: {}", user.getUserName(), inviteAchievement.getCount());
|
||||
@@ -230,6 +234,7 @@ public class TempOrdersTask {
|
||||
|
||||
inviteAchievement.setState(1);
|
||||
inviteAchievementService.updateById(inviteAchievement);
|
||||
incomeMoney = incomeMoney.add(new BigDecimal(amount));
|
||||
|
||||
//代理
|
||||
if (StringUtils.isNotBlank(user.getQdCode()) && !"666666".equals(user.getQdCode())) {
|
||||
@@ -242,6 +247,12 @@ public class TempOrdersTask {
|
||||
|
||||
userMoneyService.updateSysAmount(1, sysUser.getUserId(), Double.parseDouble(qdAward));
|
||||
userMoneyDetailsService.save(userMoneyDetails4);
|
||||
|
||||
UserMoney userMoney = userMoneyService.selectSysUserMoneyByUserId(sysUser.getSysUserId());
|
||||
userMoney.setInviteIncomeMoney(userMoney.getInviteIncomeMoney().add(new BigDecimal(qdAward)));
|
||||
userMoneyService.update(userMoney, new LambdaQueryWrapper<UserMoney>()
|
||||
.eq(UserMoney::getSysUserId, userMoney.getSysUserId())
|
||||
.eq(UserMoney::getId, userMoney.getId()));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -252,7 +263,7 @@ public class TempOrdersTask {
|
||||
.eq(InviteAchievement::getState, 1));
|
||||
logger.info("邀请人员: {}", count);
|
||||
//count 邀请的已达标人数
|
||||
completAwardService.list(new QueryWrapper<CompletAward>().eq("invite_count", count).eq("status", 1)).forEach(completAward -> {
|
||||
for (CompletAward completAward : completAwardService.list(new QueryWrapper<CompletAward>().eq("invite_count", count).eq("status", 1))) {
|
||||
QueryWrapper<UserMoneyDetails> moneyDetailsQuery = new QueryWrapper<>();
|
||||
moneyDetailsQuery.eq("classify", 6);
|
||||
moneyDetailsQuery.eq("user_id", sourceUser.getUserId());
|
||||
@@ -269,6 +280,7 @@ public class TempOrdersTask {
|
||||
|
||||
userMoneyService.updateMoney(1, sourceUser.getUserId(), completAward.getAwardNumber().doubleValue());
|
||||
userMoneyDetailsService.save(userMoneyDetails1);
|
||||
incomeCoin = completAward.getAwardNumber();
|
||||
break;
|
||||
case 2:
|
||||
UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails(
|
||||
@@ -277,10 +289,21 @@ public class TempOrdersTask {
|
||||
|
||||
userMoneyService.updateAmount(1, sourceUser.getUserId(), completAward.getAwardNumber().doubleValue());
|
||||
userMoneyDetailsService.save(userMoneyDetails2);
|
||||
incomeMoney = incomeMoney.add(completAward.getAwardNumber());
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
if (incomeMoney.compareTo(BigDecimal.ZERO) > 0 || incomeCoin.compareTo(BigDecimal.ZERO) > 0) {
|
||||
UserMoney userMoney = userMoneyService.selectUserMoneyByUserId(sourceUser.getUserId());
|
||||
userMoney.setInviteIncomeCoin(userMoney.getInviteIncomeCoin().add(incomeCoin));
|
||||
userMoney.setInviteIncomeMoney(userMoney.getInviteIncomeMoney().add(incomeMoney));
|
||||
userMoneyService.update(userMoney, new LambdaQueryWrapper<UserMoney>()
|
||||
.eq(UserMoney::getUserId, userMoney.getUserId())
|
||||
.eq(UserMoney::getId, userMoney.getId()));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user