From 282b7724305d9a0b9723712125282fd6846c173d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 31 Dec 2024 14:19:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 31690763..6e00f424 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -187,6 +187,7 @@ public class TempOrdersTask { } ThreadUtil.execAsync(() -> { + ThreadUtil.sleep(1000); activities(user, byUser); }); } @@ -200,6 +201,7 @@ public class TempOrdersTask { InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId()); // 首次达标 int signCount = Integer.parseInt(commonRepository.findOne(913).getValue()); + logger.info("{}签到次数: {}", user.getUserName(), inviteAchievement.getCount()); if (inviteAchievement.getState() == 0 && inviteAchievement.getCount() >= signCount) { //满3笔 String amount = commonRepository.findOne(912).getValue(); @@ -240,7 +242,7 @@ public class TempOrdersTask { new LambdaQueryWrapper() .eq(InviteAchievement::getSourceUserId, sourceUser.getUserId()) .eq(InviteAchievement::getState, 1)); - + logger.info("邀请人员: {}", count); //count 邀请的已达标人数 completAwardService.list(new QueryWrapper().eq("invite_count", count).eq("status", 1)).forEach(completAward -> { QueryWrapper moneyDetailsQuery = new QueryWrapper<>(); From eb3467ad5a6a9e40436953023bbf87cbbb60962f Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 31 Dec 2024 14:32:06 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=20?= =?UTF-8?q?=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/job/task/TempOrdersTask.java | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) 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 From de590aa30d3918bf6c1e55d4b24ad3b3b6a202e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 31 Dec 2024 15:05:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/InviteAchievementServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/InviteAchievementServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/InviteAchievementServiceImpl.java index 261caf17..d25ee40c 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/InviteAchievementServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/InviteAchievementServiceImpl.java @@ -52,7 +52,3 @@ public class InviteAchievementServiceImpl extends ServiceImpl Date: Tue, 31 Dec 2024 15:05:29 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 82792315..75832e99 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -77,7 +77,7 @@ public class TempOrdersTask { private Logger logger = LoggerFactory.getLogger(getClass()); - public TempOrdersTask(InviteAchievementService inviteAchievementService,TempOrdersTask ordersTask) { + public TempOrdersTask(InviteAchievementService inviteAchievementService) { this.inviteAchievementService = inviteAchievementService; } From 9160bf0a56a2b017b077afacf90ebab9a331db53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 31 Dec 2024 15:49:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=9A=E6=9D=A1=E6=8A=A5=E9=94=99=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 3 ++- src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java | 3 +++ src/main/resources/mapper/pay/PayDetailsDao.xml | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) 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 75832e99..e2dd719e 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.common.utils.DateUtils; import com.sqx.modules.app.entity.InviteAchievement; import com.sqx.modules.app.entity.UserEntity; @@ -98,7 +99,7 @@ public class TempOrdersTask { for (Orders order : orders) { ThreadUtil.sleep(100); - PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); + PayDetails payDetails = payDetailsDao.selectOneByLimit(order.getOrdersNo()); if (payDetails == null) { order.setStatus(3); ordersDao.updateById(order); diff --git a/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java b/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java index 5dd57050..830246fc 100644 --- a/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java +++ b/src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java @@ -7,6 +7,7 @@ import com.sqx.modules.pay.entity.PayDetails; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -21,6 +22,8 @@ public interface PayDetailsDao extends BaseMapper { PayDetails selectByRemark(@Param("remark") String remark); PayDetails selectByOrderId(@Param("orderId") String orderId); + PayDetails selectOneByLimit(@Param("orderId") String ordersNo); + PayDetails selectByTradeNo(@Param("tradeNo") String tradeNo); diff --git a/src/main/resources/mapper/pay/PayDetailsDao.xml b/src/main/resources/mapper/pay/PayDetailsDao.xml index e31af69c..3f62ab58 100644 --- a/src/main/resources/mapper/pay/PayDetailsDao.xml +++ b/src/main/resources/mapper/pay/PayDetailsDao.xml @@ -15,6 +15,10 @@ select * from pay_details d where d.order_id=#{orderId} + + From f74e29c09fd85a8cddf0a331e81f0e4588144dd7 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Tue, 31 Dec 2024 15:49:48 +0800 Subject: [PATCH 6/6] =?UTF-8?q?UserIntegral=20=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Impl/UserIntegralServiceImpl.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralServiceImpl.java b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralServiceImpl.java index 1ca8ad33..97cc795a 100644 --- a/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralServiceImpl.java +++ b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralServiceImpl.java @@ -22,13 +22,16 @@ public class UserIntegralServiceImpl extends ServiceImpl().eq(UserIntegral::getUserId, id)); - if (userIntegral == null) { - userIntegral = new UserIntegral(); - userIntegral.setUserId(id); - userIntegral.setIntegralNum(0); - userIntegralDao.insert(userIntegral); - } +// UserIntegral userIntegral = baseMapper.selectOne(new LambdaQueryWrapper().eq(UserIntegral::getUserId, id)); +// if (userIntegral == null) { +// userIntegral = new UserIntegral(); +// userIntegral.setUserId(id); +// userIntegral.setIntegralNum(0); +// userIntegralDao.insert(userIntegral); +// } +// return userIntegral; + UserIntegral userIntegral = new UserIntegral(); + userIntegral.setUserId(id); return userIntegral; }