feat: 达标奖励查询方式修改
This commit is contained in:
@@ -9,8 +9,10 @@ import com.sqx.common.utils.ApiAccessLimitUtil;
|
|||||||
import com.sqx.common.utils.DateUtils;
|
import com.sqx.common.utils.DateUtils;
|
||||||
import com.sqx.common.utils.RedisKeys;
|
import com.sqx.common.utils.RedisKeys;
|
||||||
import com.sqx.common.utils.Result;
|
import com.sqx.common.utils.Result;
|
||||||
|
import com.sqx.modules.app.entity.InviteAchievement;
|
||||||
import com.sqx.modules.app.entity.UserEntity;
|
import com.sqx.modules.app.entity.UserEntity;
|
||||||
import com.sqx.modules.app.entity.UserMoneyDetails;
|
import com.sqx.modules.app.entity.UserMoneyDetails;
|
||||||
|
import com.sqx.modules.app.service.InviteAchievementService;
|
||||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||||
import com.sqx.modules.app.service.UserMoneyService;
|
import com.sqx.modules.app.service.UserMoneyService;
|
||||||
import com.sqx.modules.app.service.UserService;
|
import com.sqx.modules.app.service.UserService;
|
||||||
@@ -72,11 +74,12 @@ public class WuyouController {
|
|||||||
private final CompletAwardService completAwardService;
|
private final CompletAwardService completAwardService;
|
||||||
private final SysUserService sysUserService;
|
private final SysUserService sysUserService;
|
||||||
private final WuyouPay wuyouPay;
|
private final WuyouPay wuyouPay;
|
||||||
|
private final InviteAchievementService inviteAchievementService;
|
||||||
private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
|
|
||||||
WuyouController(OrdersService ordersService, PayDetailsDao payDetailsDao, UserService userService, InviteService inviteService, CashOutDao cashOutDao,
|
WuyouController(OrdersService ordersService, PayDetailsDao payDetailsDao, UserService userService, InviteService inviteService, CashOutDao cashOutDao,
|
||||||
UserMoneyService userMoneyService, UserMoneyDetailsService userMoneyDetailsService, CommonInfoService commonRepository,
|
UserMoneyService userMoneyService, UserMoneyDetailsService userMoneyDetailsService, CommonInfoService commonRepository,
|
||||||
InviteDao inviteDao, CompletAwardService completAwardService, SysUserService sysUserService, WuyouPay wuyouPay) {
|
InviteDao inviteDao, CompletAwardService completAwardService, SysUserService sysUserService, WuyouPay wuyouPay, InviteAchievementService inviteAchievementService) {
|
||||||
this.ordersService = ordersService;
|
this.ordersService = ordersService;
|
||||||
this.payDetailsDao = payDetailsDao;
|
this.payDetailsDao = payDetailsDao;
|
||||||
this.userService = userService;
|
this.userService = userService;
|
||||||
@@ -89,6 +92,7 @@ public class WuyouController {
|
|||||||
this.completAwardService = completAwardService;
|
this.completAwardService = completAwardService;
|
||||||
this.sysUserService = sysUserService;
|
this.sysUserService = sysUserService;
|
||||||
this.wuyouPay = wuyouPay;
|
this.wuyouPay = wuyouPay;
|
||||||
|
this.inviteAchievementService = inviteAchievementService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Debounce(interval = 1000, value = "#orderId")
|
@Debounce(interval = 1000, value = "#orderId")
|
||||||
@@ -243,54 +247,62 @@ public class WuyouController {
|
|||||||
if (sourceUser == null || sourceUser.getUserId() == 1) {
|
if (sourceUser == null || sourceUser.getUserId() == 1) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper<>();
|
// QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.eq("classify", 6);
|
// queryWrapper.eq("classify", 6);
|
||||||
queryWrapper.eq("user_id", sourceUser.getUserId());
|
// queryWrapper.eq("user_id", sourceUser.getUserId());
|
||||||
queryWrapper.eq("by_user_id", user.getUserId());
|
// queryWrapper.eq("by_user_id", user.getUserId());
|
||||||
int count = userMoneyDetailsService.count(queryWrapper);
|
// int count = userMoneyDetailsService.count(queryWrapper);
|
||||||
if (count == 0) {
|
InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId());
|
||||||
|
// 首次达标
|
||||||
|
int signCount = Integer.parseInt(commonRepository.findOne(913).getValue());
|
||||||
|
if (inviteAchievement.getIsFirst() == 1 && inviteAchievement.getCount() >= signCount) {
|
||||||
//满3笔
|
//满3笔
|
||||||
Integer sumOrderNum = ordersService.countOrderNum(user.getUserId(), null);
|
// Integer sumOrderNum = ordersService.countOrderNum(user.getUserId(), null);
|
||||||
if (sumOrderNum >= Integer.parseInt(commonRepository.findOne(913).getValue())) {
|
// if (sumOrderNum >= Integer.parseInt(commonRepository.findOne(913).getValue())) {
|
||||||
String amount = commonRepository.findOne(912).getValue();
|
String amount = commonRepository.findOne(912).getValue();
|
||||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||||
userMoneyDetails.setClassify(6);
|
userMoneyDetails.setClassify(6);
|
||||||
userMoneyDetails.setMoney(new BigDecimal(amount));
|
userMoneyDetails.setMoney(new BigDecimal(amount));
|
||||||
userMoneyDetails.setUserId(sourceUser.getUserId());
|
userMoneyDetails.setUserId(sourceUser.getUserId());
|
||||||
userMoneyDetails.setByUserId(user.getUserId());
|
userMoneyDetails.setByUserId(user.getUserId());
|
||||||
userMoneyDetails.setCreateTime(DateUtil.now());
|
userMoneyDetails.setCreateTime(DateUtil.now());
|
||||||
userMoneyDetails.setContent("分享达标奖励" + amount + "元");
|
userMoneyDetails.setContent("分享达标奖励" + amount + "元");
|
||||||
userMoneyDetails.setTitle("分享达标奖励");
|
userMoneyDetails.setTitle("分享达标奖励");
|
||||||
userMoneyDetails.setState(2);
|
userMoneyDetails.setState(2);
|
||||||
userMoneyDetails.setType(1);
|
userMoneyDetails.setType(1);
|
||||||
userMoneyDetails.setMoneyType(1);
|
userMoneyDetails.setMoneyType(1);
|
||||||
userMoneyDetailsService.save(userMoneyDetails);
|
userMoneyDetailsService.save(userMoneyDetails);
|
||||||
//存入余额 钱
|
//存入余额 钱
|
||||||
userMoneyService.updateAmount(1, sourceUser.getUserId(), Double.parseDouble(amount));
|
userMoneyService.updateAmount(1, sourceUser.getUserId(), Double.parseDouble(amount));
|
||||||
|
|
||||||
|
int count = inviteAchievementService.countBySourceUserId(sourceUser.getUserId());
|
||||||
|
// 首次达标奖励
|
||||||
|
if (count == 0) {
|
||||||
SysUserEntity sysUser = sysUserService.selectSysUserByQdCode(user.getQdCode());
|
SysUserEntity sysUser = sysUserService.selectSysUserByQdCode(user.getQdCode());
|
||||||
String qdAward = commonRepository.findOne(915).getValue();
|
String qdAward = commonRepository.findOne(915).getValue();
|
||||||
|
|
||||||
UserMoneyDetails userMoneyDetails4 = new UserMoneyDetails(
|
UserMoneyDetails userMoneyDetails4 = new UserMoneyDetails(
|
||||||
null, sysUser == null ? null : sysUser.getUserId(), null, "[分享达标额外奖励]", 6, 1, 2,
|
null, sysUser == null ? null : sysUser.getUserId(), null, "[分享达标额外奖励]", 6, 1, 2,
|
||||||
new BigDecimal(qdAward), "推广人员首次达标,额外奖励现金红包" + qdAward, 2);
|
new BigDecimal(qdAward), "推广人员首次达标,额外奖励现金红包" + qdAward, 2);
|
||||||
|
|
||||||
userMoneyService.updateSysAmount(1, sysUser == null ? null : sysUser.getUserId(), Double.parseDouble(qdAward));
|
userMoneyService.updateSysAmount(1, sysUser == null ? null : sysUser.getUserId(), Double.parseDouble(qdAward));
|
||||||
userMoneyDetailsService.save(userMoneyDetails4);
|
userMoneyDetailsService.save(userMoneyDetails4);
|
||||||
|
|
||||||
Invite invite = inviteService.selectInviteByUser(sourceUser.getUserId(), user.getUserId(), 1);
|
|
||||||
if (invite != null) {
|
|
||||||
invite.setMoney(Double.valueOf(amount));
|
|
||||||
invite.setState(1);
|
|
||||||
inviteDao.updateById(invite);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Invite invite = inviteService.selectInviteByUser(sourceUser.getUserId(), user.getUserId(), 1);
|
||||||
|
if (invite != null) {
|
||||||
|
invite.setMoney(Double.valueOf(amount));
|
||||||
|
invite.setState(1);
|
||||||
|
inviteDao.updateById(invite);
|
||||||
|
}
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
QueryWrapper<UserMoneyDetails> moneyDetailsQuery = new QueryWrapper<>();
|
QueryWrapper<UserMoneyDetails> moneyDetailsQuery = new QueryWrapper<>();
|
||||||
moneyDetailsQuery.eq("classify", 6);
|
moneyDetailsQuery.eq("classify", 6);
|
||||||
moneyDetailsQuery.eq("user_id", sourceUser.getUserId());
|
moneyDetailsQuery.eq("user_id", sourceUser.getUserId());
|
||||||
//达标人数
|
//达标人数
|
||||||
int completeCount = userMoneyDetailsService.count(moneyDetailsQuery);
|
// int completeCount = userMoneyDetailsService.count(moneyDetailsQuery);
|
||||||
|
int completeCount = inviteAchievementService.countNum(sourceUser.getUserId(), signCount);
|
||||||
completAwardService.list(new QueryWrapper<CompletAward>().eq("invite_count", completeCount)).forEach(completAward -> {
|
completAwardService.list(new QueryWrapper<CompletAward>().eq("invite_count", completeCount)).forEach(completAward -> {
|
||||||
switch (completAward.getType()) {
|
switch (completAward.getType()) {
|
||||||
case 1:
|
case 1:
|
||||||
@@ -346,6 +358,18 @@ public class WuyouController {
|
|||||||
}
|
}
|
||||||
ordersService.updateById(order);
|
ordersService.updateById(order);
|
||||||
ordersService.insertOrders(order);
|
ordersService.insertOrders(order);
|
||||||
|
InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId());
|
||||||
|
if (inviteAchievement == null) {
|
||||||
|
inviteAchievement = new InviteAchievement();
|
||||||
|
inviteAchievement.setIsFirst(1);
|
||||||
|
inviteAchievement.setCount(1);
|
||||||
|
inviteAchievement.setCreateTime(DateUtil.date());
|
||||||
|
inviteAchievement.setUserId(user.getUserId());
|
||||||
|
inviteAchievement.setSourceUserId(byUser.getUserId());
|
||||||
|
inviteAchievementService.insertNotExists(inviteAchievement);
|
||||||
|
} else {
|
||||||
|
inviteAchievementService.incrCount(inviteAchievement.getId(), 1);
|
||||||
|
}
|
||||||
ThreadUtil.execAsync(() -> {
|
ThreadUtil.execAsync(() -> {
|
||||||
activities(user, byUser);
|
activities(user, byUser);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user