diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index c29c9f50..937c1818 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -164,7 +164,7 @@ public class TempOrdersTask { UserEntity user = userService.selectUserById(order.getUserId()); UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode()); // UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); - if (byUser != null) { + if (byUser != null && !byUser.getUserId().equals(1L)) { InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId()); if (inviteAchievement == null) { inviteAchievement = new InviteAchievement(); @@ -177,15 +177,15 @@ public class TempOrdersTask { } else { inviteAchievementService.incrCount(inviteAchievement.getId(), inviteAchievement.getUserId(), 1); } - } - ThreadUtil.execAsync(() -> { - ThreadUtil.sleep(1000); - activities(user, byUser); - }); + ThreadUtil.execAsync(() -> { + ThreadUtil.sleep(1000); + activities(user, byUser); + }); - ThreadUtil.execAsync(() -> { - inviteService.updateInvite(byUser, DateUtil.now(), user.getUserId(), order.getPayMoney()); - }); + ThreadUtil.execAsync(() -> { + inviteService.updateInvite(byUser, DateUtil.now(), user.getUserId(), order.getPayMoney()); + }); + } //增加剧集支付次数 ThreadUtil.execAsync(() -> { diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java index 62e0bd9e..0550e5d4 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java @@ -2,28 +2,14 @@ package com.sqx.modules.pay.controller.app; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.sqx.common.annotation.Debounce; -import com.sqx.common.utils.ApiAccessLimitUtil; -import com.sqx.common.utils.DateUtils; -import com.sqx.common.utils.RedisKeys; 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.UserMoneyDetails; -import com.sqx.modules.app.service.InviteAchievementService; import com.sqx.modules.app.service.UserMoneyDetailsService; import com.sqx.modules.app.service.UserMoneyService; import com.sqx.modules.app.service.UserService; -import com.sqx.modules.common.service.CommonInfoService; -import com.sqx.modules.complet.entity.CompletAward; -import com.sqx.modules.complet.service.CompletAwardService; -import com.sqx.modules.invite.dao.InviteDao; -import com.sqx.modules.invite.entity.Invite; -import com.sqx.modules.invite.service.InviteService; import com.sqx.modules.job.task.TempOrdersTask; import com.sqx.modules.orders.entity.Orders; import com.sqx.modules.orders.service.OrdersService; @@ -37,27 +23,22 @@ import com.sqx.modules.pay.wuyou.Encrypt; import com.sqx.modules.pay.wuyou.NotifyDto; import com.sqx.modules.pay.wuyou.WuyouPay; import com.sqx.modules.redisService.RedisService; -import com.sqx.modules.sys.entity.SysUserEntity; -import com.sqx.modules.sys.service.SysUserService; import com.sqx.modules.utils.AliPayOrderUtil; import com.sqx.modules.utils.InvitationCodeUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.context.ApplicationContext; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.stream.Collectors; /** * @author GYJ