多余日志
This commit is contained in:
parent
f13d21bc63
commit
805fdef755
|
|
@ -239,12 +239,12 @@ public class TempOrdersTask {
|
||||||
@Transactional
|
@Transactional
|
||||||
public void activities(UserEntity user, UserEntity sourceUser) {
|
public void activities(UserEntity user, UserEntity sourceUser) {
|
||||||
//分享达标
|
//分享达标
|
||||||
logger.info("活动领取开始: 用户: {}, 邀请用户: {}", user.getUserName(), sourceUser.getUserName());
|
// logger.info("活动领取开始: 用户: {}, 邀请用户: {}", user.getUserName(), sourceUser.getUserName());
|
||||||
InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId());
|
InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId());
|
||||||
|
|
||||||
// 首次达标
|
// 首次达标
|
||||||
int signCount = Integer.parseInt(commonRepository.findOne(913).getValue());
|
int signCount = Integer.parseInt(commonRepository.findOne(913).getValue());
|
||||||
logger.info("{}签到次数: {}", user.getUserName(), inviteAchievement.getCount());
|
// logger.info("{}签到次数: {}", user.getUserName(), inviteAchievement.getCount());
|
||||||
if (inviteAchievement.getState() == 0 && inviteAchievement.getCount() >= signCount) {
|
if (inviteAchievement.getState() == 0 && inviteAchievement.getCount() >= signCount) {
|
||||||
//满3笔
|
//满3笔
|
||||||
String amount = commonRepository.findOne(912).getValue();
|
String amount = commonRepository.findOne(912).getValue();
|
||||||
|
|
@ -305,7 +305,7 @@ public class TempOrdersTask {
|
||||||
// 检查用户是否实名认证
|
// 检查用户是否实名认证
|
||||||
UserInfo userInfo = userInfoService.getOne(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getUserId, sourceUser.getUserId()));
|
UserInfo userInfo = userInfoService.getOne(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getUserId, sourceUser.getUserId()));
|
||||||
if (userInfo == null || StrUtil.isBlank(userInfo.getCertNo())) {
|
if (userInfo == null || StrUtil.isBlank(userInfo.getCertNo())) {
|
||||||
logger.info("邀请用户: {} 未实名认证,不发放奖励", sourceUser.getUserId());
|
// logger.info("邀请用户: {} 未实名认证,不发放奖励", sourceUser.getUserId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -317,7 +317,7 @@ public class TempOrdersTask {
|
||||||
.eq(Orders::getPayWay, 9)
|
.eq(Orders::getPayWay, 9)
|
||||||
.ge(Orders::getCreateTime, beginOfDay));
|
.ge(Orders::getCreateTime, beginOfDay));
|
||||||
if (orderCount < signCount) {
|
if (orderCount < signCount) {
|
||||||
logger.info("用户: {} 未达到签到条件: {}", user.getUserId(), signCount);
|
// logger.info("用户: {} 未达到签到条件: {}", user.getUserId(), signCount);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -329,7 +329,7 @@ public class TempOrdersTask {
|
||||||
moneyDetailsQuery.ge(UserMoneyDetails::getCreateTime, beginOfDay);
|
moneyDetailsQuery.ge(UserMoneyDetails::getCreateTime, beginOfDay);
|
||||||
int count = userMoneyDetailsService.count(moneyDetailsQuery);
|
int count = userMoneyDetailsService.count(moneyDetailsQuery);
|
||||||
if (count > 0) {
|
if (count > 0) {
|
||||||
logger.info("用户: {} 今日已领取奖励", user.getUserId());
|
// logger.info("用户: {} 今日已领取奖励", user.getUserId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -352,7 +352,7 @@ 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());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -273,7 +273,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Result insertCourseOrders(Long courseId, Long courseDetailsId, Long userId) {
|
public Result insertCourseOrders(Long courseId, Long courseDetailsId, Long userId) {
|
||||||
log.info("生成商品订单信息接口入参为:{},{}", courseId, userId);
|
log.info("生成商品订单:{}", userId);
|
||||||
|
|
||||||
if (!redisService.getUserCanCreateOrder(userId)) {
|
if (!redisService.getUserCanCreateOrder(userId)) {
|
||||||
log.info("操作过于频繁,请稍后再试!userId:{}", userId);
|
log.info("操作过于频繁,请稍后再试!userId:{}", userId);
|
||||||
|
|
@ -923,7 +923,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
@Override
|
@Override
|
||||||
@SneakyThrows
|
@SneakyThrows
|
||||||
public double selectSignInAwardMoney(Integer flag, String time, Long sysUserId) {
|
public double selectSignInAwardMoney(Integer flag, String time, Long sysUserId) {
|
||||||
Map<String,Object> param = new HashMap<>(3);
|
Map<String, Object> param = new HashMap<>(3);
|
||||||
param.put("flag", flag);
|
param.put("flag", flag);
|
||||||
param.put("time", time);
|
param.put("time", time);
|
||||||
param.put("sysUserId", sysUserId);
|
param.put("sysUserId", sysUserId);
|
||||||
|
|
@ -935,7 +935,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
@Override
|
@Override
|
||||||
@SneakyThrows
|
@SneakyThrows
|
||||||
public double selectShareAwardMoney(Integer flag, String time, Long sysUserId) {
|
public double selectShareAwardMoney(Integer flag, String time, Long sysUserId) {
|
||||||
Map<String,Object> param = new HashMap<>(3);
|
Map<String, Object> param = new HashMap<>(3);
|
||||||
param.put("flag", flag);
|
param.put("flag", flag);
|
||||||
param.put("time", time);
|
param.put("time", time);
|
||||||
param.put("sysUserId", sysUserId);
|
param.put("sysUserId", sysUserId);
|
||||||
|
|
@ -947,7 +947,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
@Override
|
@Override
|
||||||
@SneakyThrows
|
@SneakyThrows
|
||||||
public double selectNewUserTaskDoneAwardMoney(Integer flag, String time, Long sysUserId) {
|
public double selectNewUserTaskDoneAwardMoney(Integer flag, String time, Long sysUserId) {
|
||||||
Map<String,Object> param = new HashMap<>(3);
|
Map<String, Object> param = new HashMap<>(3);
|
||||||
param.put("flag", flag);
|
param.put("flag", flag);
|
||||||
param.put("time", time);
|
param.put("time", time);
|
||||||
param.put("sysUserId", sysUserId);
|
param.put("sysUserId", sysUserId);
|
||||||
|
|
@ -959,7 +959,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
@Override
|
@Override
|
||||||
@SneakyThrows
|
@SneakyThrows
|
||||||
public double selectInviteTaskDoneAwardMoney(Integer flag, String time, Long sysUserId) {
|
public double selectInviteTaskDoneAwardMoney(Integer flag, String time, Long sysUserId) {
|
||||||
Map<String,Object> param = new HashMap<>(3);
|
Map<String, Object> param = new HashMap<>(3);
|
||||||
param.put("flag", flag);
|
param.put("flag", flag);
|
||||||
param.put("time", time);
|
param.put("time", time);
|
||||||
param.put("sysUserId", sysUserId);
|
param.put("sysUserId", sysUserId);
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,6 @@ public class WuyouController {
|
||||||
@Login
|
@Login
|
||||||
@GetMapping("/payOrder/{orderId}")
|
@GetMapping("/payOrder/{orderId}")
|
||||||
public Result payOrder(HttpServletRequest request, @RequestAttribute("userId") Long userId, @PathVariable("orderId") Long orderId, @RequestParam(value = "payType", required = false) String payType) {
|
public Result payOrder(HttpServletRequest request, @RequestAttribute("userId") Long userId, @PathVariable("orderId") Long orderId, @RequestParam(value = "payType", required = false) String payType) {
|
||||||
log.info("支付订单payOrder1:{}", orderId);
|
|
||||||
Orders order = ordersService.getById(orderId, userId);
|
Orders order = ordersService.getById(orderId, userId);
|
||||||
if (order == null) {
|
if (order == null) {
|
||||||
return Result.error("订单不存在");
|
return Result.error("订单不存在");
|
||||||
|
|
@ -112,7 +111,6 @@ public class WuyouController {
|
||||||
payDetails.setTradeNo(AliPayOrderUtil.createOrderId());
|
payDetails.setTradeNo(AliPayOrderUtil.createOrderId());
|
||||||
payDetailsDao.update(payDetails, new LambdaQueryWrapper<PayDetails>().eq(PayDetails::getId, payDetails.getId()).eq(PayDetails::getUserId, payDetails.getUserId()));
|
payDetailsDao.update(payDetails, new LambdaQueryWrapper<PayDetails>().eq(PayDetails::getId, payDetails.getId()).eq(PayDetails::getUserId, payDetails.getUserId()));
|
||||||
}
|
}
|
||||||
log.info("支付订单payOrder2:{}", orderId);
|
|
||||||
if (order.getPayMoney().compareTo(BigDecimal.ZERO) == 0) {
|
if (order.getPayMoney().compareTo(BigDecimal.ZERO) == 0) {
|
||||||
ordersTask.updateOrderStatus(payDetails, order);
|
ordersTask.updateOrderStatus(payDetails, order);
|
||||||
Map<String, Object> data = new HashMap<>();
|
Map<String, Object> data = new HashMap<>();
|
||||||
|
|
@ -122,7 +120,6 @@ public class WuyouController {
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
log.info("支付订单payOrder3:{}", orderId);
|
|
||||||
BaseResp baseResp = wuyouPay.payOrder(payDetails.getTradeNo(), order.getUserId(), order.getPayMoney().toString(),
|
BaseResp baseResp = wuyouPay.payOrder(payDetails.getTradeNo(), order.getUserId(), order.getPayMoney().toString(),
|
||||||
request.getHeader("User-Agent"), String.format("%d-%d", order.getCourseId(), order.getCourseDetailsId()),
|
request.getHeader("User-Agent"), String.format("%d-%d", order.getCourseId(), order.getCourseDetailsId()),
|
||||||
payType);
|
payType);
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,6 @@ public class WuyouPay {
|
||||||
}
|
}
|
||||||
|
|
||||||
public BaseResp payOrder(String orderNo, Long userId, String amount, String userAgent, String allId, String payType) {
|
public BaseResp payOrder(String orderNo, Long userId, String amount, String userAgent, String allId, String payType) {
|
||||||
log.info("支付订单payOrder4:{}", orderNo);
|
|
||||||
String payConfig = commonInfoService.findOne(926).getValue();
|
String payConfig = commonInfoService.findOne(926).getValue();
|
||||||
if (!"1".equals(payConfig)) {
|
if (!"1".equals(payConfig)) {
|
||||||
BaseResp baseResp = new BaseResp();
|
BaseResp baseResp = new BaseResp();
|
||||||
|
|
@ -72,9 +71,9 @@ public class WuyouPay {
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://dj-h5.hnsiyao.cn/me/detail/detail?allId=1230-98688
|
// https://dj-h5.hnsiyao.cn/me/detail/detail?allId=1230-98688
|
||||||
log.info("支付订单payOrder5:{}", orderNo);
|
log.info("支付订单payOrder1:{}", orderNo);
|
||||||
String body = request(Constants.PAY_URL, params, userAgent);
|
String body = request(Constants.PAY_URL, params, userAgent);
|
||||||
log.info("支付订单payOrder6:{}, body:{}", orderNo, body);
|
log.info("支付订单payOrder2:{}, body:{}", orderNo, body);
|
||||||
return JSONObject.parseObject(body, BaseResp.class);
|
return JSONObject.parseObject(body, BaseResp.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue