|
@@ -165,7 +165,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public void asyncHandleRechargeActivity(long userId, int rechargeAmount){
|
|
|
|
|
|
|
+ public void asyncHandleRechargeActivity(long userId, int rechargeAmount) {
|
|
|
log.info("RechargeActivityTask run....");
|
|
log.info("RechargeActivityTask run....");
|
|
|
// 进行中的充值权益活动
|
|
// 进行中的充值权益活动
|
|
|
// 手动切换数据源
|
|
// 手动切换数据源
|
|
@@ -180,7 +180,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
|
|
|
DynamicDataSourceContextHolder.poll();
|
|
DynamicDataSourceContextHolder.poll();
|
|
|
if (rechargeRights != null) {
|
|
if (rechargeRights != null) {
|
|
|
var userRechargeRights = new UserRechargeRights().setRightsId(rechargeRights.getId()).setUserId(userId).setRightsBalance(rechargeAmount);
|
|
var userRechargeRights = new UserRechargeRights().setRightsId(rechargeRights.getId()).setUserId(userId).setRightsBalance(rechargeAmount);
|
|
|
- BeanUtils.copyProperties(rechargeRights, userRechargeRights, "id");
|
|
|
|
|
|
|
+ BeanUtils.copyProperties(rechargeRights, userRechargeRights, "id", "create_time,update_time");
|
|
|
// 计算有效期
|
|
// 计算有效期
|
|
|
var endTime = LocalDateTime.now().with(LocalTime.MAX).plusDays(rechargeRights.getValidity() - 1);
|
|
var endTime = LocalDateTime.now().with(LocalTime.MAX).plusDays(rechargeRights.getValidity() - 1);
|
|
|
// 手动切换数据源
|
|
// 手动切换数据源
|
|
@@ -188,7 +188,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
|
|
|
userRechargeRightsService.save(userRechargeRights.setStartTime(LocalDateTime.now()).setEndTime(endTime));
|
|
userRechargeRightsService.save(userRechargeRights.setStartTime(LocalDateTime.now()).setEndTime(endTime));
|
|
|
DynamicDataSourceContextHolder.poll();
|
|
DynamicDataSourceContextHolder.poll();
|
|
|
}
|
|
}
|
|
|
- }else {
|
|
|
|
|
|
|
+ } else {
|
|
|
DynamicDataSourceContextHolder.poll();
|
|
DynamicDataSourceContextHolder.poll();
|
|
|
}
|
|
}
|
|
|
log.info("RechargeActivityTask run end....");
|
|
log.info("RechargeActivityTask run end....");
|
|
@@ -222,7 +222,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
|
|
|
DynamicDataSourceContextHolder.poll();
|
|
DynamicDataSourceContextHolder.poll();
|
|
|
if (rechargeRights != null) {
|
|
if (rechargeRights != null) {
|
|
|
var userRechargeRights = new UserRechargeRights().setRightsId(rechargeRights.getId()).setUserId(userId).setRightsBalance(rechargeAmount);
|
|
var userRechargeRights = new UserRechargeRights().setRightsId(rechargeRights.getId()).setUserId(userId).setRightsBalance(rechargeAmount);
|
|
|
- BeanUtils.copyProperties(rechargeRights, userRechargeRights, "id");
|
|
|
|
|
|
|
+ BeanUtils.copyProperties(rechargeRights, userRechargeRights, "id", "create_time,update_time");
|
|
|
// 计算有效期
|
|
// 计算有效期
|
|
|
var endTime = LocalDateTime.now().with(LocalTime.MAX).plusDays(rechargeRights.getValidity() - 1);
|
|
var endTime = LocalDateTime.now().with(LocalTime.MAX).plusDays(rechargeRights.getValidity() - 1);
|
|
|
// 手动切换数据源
|
|
// 手动切换数据源
|
|
@@ -230,7 +230,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
|
|
|
userRechargeRightsService.save(userRechargeRights.setStartTime(LocalDateTime.now()).setEndTime(endTime));
|
|
userRechargeRightsService.save(userRechargeRights.setStartTime(LocalDateTime.now()).setEndTime(endTime));
|
|
|
DynamicDataSourceContextHolder.poll();
|
|
DynamicDataSourceContextHolder.poll();
|
|
|
}
|
|
}
|
|
|
- }else {
|
|
|
|
|
|
|
+ } else {
|
|
|
DynamicDataSourceContextHolder.poll();
|
|
DynamicDataSourceContextHolder.poll();
|
|
|
}
|
|
}
|
|
|
log.info("RechargeActivityTask run end....");
|
|
log.info("RechargeActivityTask run end....");
|