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 6e00f424..82792315 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -40,11 +40,9 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.concurrent.CompletableFuture; + @Component public class TempOrdersTask { @@ -77,10 +75,9 @@ public class TempOrdersTask { private String profiles; private final InviteAchievementService inviteAchievementService; - private Logger logger = LoggerFactory.getLogger(getClass()); - public TempOrdersTask(InviteAchievementService inviteAchievementService) { + public TempOrdersTask(InviteAchievementService inviteAchievementService,TempOrdersTask ordersTask) { this.inviteAchievementService = inviteAchievementService; } @@ -150,27 +147,11 @@ public class TempOrdersTask { order.setStatus(1); order.setPayTime(DateUtils.format(new Date())); - UserEntity user = userService.selectUserById(order.getUserId()); - UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); - Map map = inviteService.updateInvite(byUser, DateUtil.now(), user.getUserId(), order.getPayMoney()); - Object oneUserId = map.get("oneUserId"); - if (oneUserId != null) { - order.setOneUserId(Long.parseLong(String.valueOf(oneUserId))); - order.setOneMoney(new BigDecimal(String.valueOf(map.get("oneMoney")))); - } - Object twoUserId = map.get("twoUserId"); - if (twoUserId != null) { - order.setTwoUserId(Long.parseLong(String.valueOf(twoUserId))); - order.setTwoMoney(new BigDecimal(String.valueOf(map.get("twoMoney")))); - } - Object sysUserId = map.get("sysUserId"); - if (sysUserId != null) { - order.setSysUserId(Long.parseLong(String.valueOf(sysUserId))); - order.setQdMoney(new BigDecimal(String.valueOf(map.get("qdMoney")))); - } ordersService.updateById(order); ordersService.insertOrders(order); + UserEntity user = userService.selectUserById(order.getUserId()); + UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); if (byUser != null) { InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId()); if (inviteAchievement == null) { @@ -185,11 +166,29 @@ public class TempOrdersTask { inviteAchievementService.incrCount(inviteAchievement.getId(), 1); } } - ThreadUtil.execAsync(() -> { ThreadUtil.sleep(1000); activities(user, byUser); }); + ThreadUtil.execAsync(() -> { + inviteService.updateInvite(byUser, DateUtil.now(), user.getUserId(), order.getPayMoney()); + }); + //Map map = inviteService.updateInvite(byUser, DateUtil.now(), user.getUserId(), order.getPayMoney()); +// Object oneUserId = map.get("oneUserId"); +// if (oneUserId != null) { +// order.setOneUserId(Long.parseLong(String.valueOf(oneUserId))); +// order.setOneMoney(new BigDecimal(String.valueOf(map.get("oneMoney")))); +// } +// Object twoUserId = map.get("twoUserId"); +// if (twoUserId != null) { +// order.setTwoUserId(Long.parseLong(String.valueOf(twoUserId))); +// order.setTwoMoney(new BigDecimal(String.valueOf(map.get("twoMoney")))); +// } +// Object sysUserId = map.get("sysUserId"); +// if (sysUserId != null) { +// order.setSysUserId(Long.parseLong(String.valueOf(sysUserId))); +// order.setQdMoney(new BigDecimal(String.valueOf(map.get("qdMoney")))); +// } } @Transactional