log111
This commit is contained in:
parent
2bde4ae173
commit
289ef5f624
|
|
@ -148,9 +148,9 @@ public class TempOrdersTask {
|
||||||
|
|
||||||
|
|
||||||
public void updateOrderStatus(PayDetails payDetails, Orders order) {
|
public void updateOrderStatus(PayDetails payDetails, Orders order) {
|
||||||
if (payDetails.getState() == 1) {
|
// if (payDetails.getState() == 1) {
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
|
|
||||||
payDetailsDao.updateState(payDetails.getId(), 1, DateUtil.now(), payDetails.getTradeNo(), payDetails.getThirdOrderNo());
|
payDetailsDao.updateState(payDetails.getId(), 1, DateUtil.now(), payDetails.getTradeNo(), payDetails.getThirdOrderNo());
|
||||||
|
|
||||||
|
|
@ -166,7 +166,7 @@ public class TempOrdersTask {
|
||||||
UserEntity user = userService.selectUserById(order.getUserId());
|
UserEntity user = userService.selectUserById(order.getUserId());
|
||||||
UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode());
|
UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode());
|
||||||
|
|
||||||
if(user.getUserId().equals(14244L)) {
|
if (user.getUserId().equals(14244L)) {
|
||||||
logger.info("测试用户:{}, 邀请用户 id {}, 订单号:{}, 上级用户:{}", user.getInviterCode(), user.getInviterUserId(), order.getOrdersNo(), (byUser == null ? "无" : byUser.getUserId()));
|
logger.info("测试用户:{}, 邀请用户 id {}, 订单号:{}, 上级用户:{}", user.getInviterCode(), user.getInviterUserId(), order.getOrdersNo(), (byUser == null ? "无" : byUser.getUserId()));
|
||||||
}
|
}
|
||||||
// UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode());
|
// UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode());
|
||||||
|
|
@ -185,7 +185,7 @@ public class TempOrdersTask {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (byUser != null && !byUser.getUserId().equals(1L)) {
|
if (byUser != null && !byUser.getUserId().equals(1L)) {
|
||||||
if(user.getUserId().equals(14244L)) {
|
if (user.getUserId().equals(14244L)) {
|
||||||
logger.info("进入 byUser != null && !byUser.getUserId().equals(1L)");
|
logger.info("进入 byUser != null && !byUser.getUserId().equals(1L)");
|
||||||
}
|
}
|
||||||
ThreadUtil.execAsync(() -> {
|
ThreadUtil.execAsync(() -> {
|
||||||
|
|
@ -198,7 +198,7 @@ public class TempOrdersTask {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if ("666666".equals(user.getInviterCode()) || byUser == null || byUser.getUserId().equals(1L)) {
|
if ("666666".equals(user.getInviterCode()) || byUser == null || byUser.getUserId().equals(1L)) {
|
||||||
if(user.getUserId().equals(14244L)) {
|
if (user.getUserId().equals(14244L)) {
|
||||||
logger.info("进入 if (\"666666\".equals(user.getInviterCode()) || byUser == null || byUser.getUserId().equals(1L)) {");
|
logger.info("进入 if (\"666666\".equals(user.getInviterCode()) || byUser == null || byUser.getUserId().equals(1L)) {");
|
||||||
}
|
}
|
||||||
SysUserEntity sysUser = sysUserService.selectSysUserByQdCode(user.getQdCode());
|
SysUserEntity sysUser = sysUserService.selectSysUserByQdCode(user.getQdCode());
|
||||||
|
|
@ -289,6 +289,7 @@ public class TempOrdersTask {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 计算用户邀请奖励金额
|
* 计算用户邀请奖励金额
|
||||||
|
*
|
||||||
* @param user 用户
|
* @param user 用户
|
||||||
*/
|
*/
|
||||||
private void calcUserInviteAmount(UserEntity user, UserEntity sourceUser, Integer signCount) {
|
private void calcUserInviteAmount(UserEntity user, UserEntity sourceUser, Integer signCount) {
|
||||||
|
|
@ -342,12 +343,11 @@ public class TempOrdersTask {
|
||||||
userMoneyDetailsService.save(userMoneyDetails);
|
userMoneyDetailsService.save(userMoneyDetails);
|
||||||
//上级 存入余额 钱
|
//上级 存入余额 钱
|
||||||
userMoneyService.updateAmount(1, sourceUser.getUserId(), sourceUser.getInviteAmount().doubleValue());
|
userMoneyService.updateAmount(1, sourceUser.getUserId(), sourceUser.getInviteAmount().doubleValue());
|
||||||
logger.info("用户: {} 邀请用户: {} 下级签到奖励: {}", sourceUser.getUserId(), user.getUserId(), sourceUser.getInviteAmount());
|
logger.info("用户: {} 邀请用户: {} 下级签到奖励: {}", sourceUser.getUserId(), user.getUserId(), sourceUser.getInviteAmount());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 计算分享达标奖励
|
* 计算分享达标奖励
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
private void calcInviteStandardAward(UserEntity sourceUser) {
|
private void calcInviteStandardAward(UserEntity sourceUser) {
|
||||||
Set<Long> byUserIdList = inviteAchievementService.list(new LambdaQueryWrapper<InviteAchievement>().eq(InviteAchievement::getUserId, sourceUser.getUserId())
|
Set<Long> byUserIdList = inviteAchievementService.list(new LambdaQueryWrapper<InviteAchievement>().eq(InviteAchievement::getUserId, sourceUser.getUserId())
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,17 @@ public class Tets {
|
||||||
@Autowired
|
@Autowired
|
||||||
private OrdersService ordersService;
|
private OrdersService ordersService;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testOrder() {
|
||||||
|
String orderNo = "70ae4e2707834bad8f06c9555dbf2528";
|
||||||
|
|
||||||
|
PayDetails payDetails = payDetailsDao.selectOne(new LambdaQueryWrapper<PayDetails>().eq(PayDetails::getOrderId, orderNo));
|
||||||
|
|
||||||
|
Orders orders = ordersService.getOne(Wrappers.<Orders>lambdaQuery().eq(Orders::getOrdersNo, orderNo));
|
||||||
|
|
||||||
|
tempOrdersTask.updateOrderStatus(payDetails, orders);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testUserInviteCount() {
|
public void testUserInviteCount() {
|
||||||
List<UserEntity> userList = userService.list(Wrappers.emptyWrapper());
|
List<UserEntity> userList = userService.list(Wrappers.emptyWrapper());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue