From a7147f875d702668f900cff5b84b03df6e2788ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 10 Jan 2025 16:42:39 +0800 Subject: [PATCH] =?UTF-8?q?user=E5=A2=9E=E5=8A=A0=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E4=BA=BAid=EF=BC=8C=E9=80=9A=E8=BF=87=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E7=A0=81=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BAid=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/app/entity/UserEntity.java | 5 +++++ .../sqx/modules/app/service/UserService.java | 2 ++ .../app/service/impl/UserServiceImpl.java | 21 +++++++++++++++---- .../service/impl/InviteServiceImpl.java | 7 +++++-- .../sqx/modules/job/task/TempOrdersTask.java | 3 ++- .../pay/controller/app/AliPayController.java | 3 ++- .../pay/service/impl/DyServiceImpl.java | 6 ++++-- .../pay/service/impl/KsServiceImpl.java | 3 ++- .../pay/service/impl/WxServiceImpl.java | 6 ++++-- 9 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/entity/UserEntity.java b/src/main/java/com/sqx/modules/app/entity/UserEntity.java index 2c8d95fd..72cfdbc4 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserEntity.java +++ b/src/main/java/com/sqx/modules/app/entity/UserEntity.java @@ -178,6 +178,11 @@ public class UserEntity implements Serializable { */ private String qdCode; + /** + * 邀请人id + */ + private Long inviterUserId; + /** * 是否是新用户 1否 */ diff --git a/src/main/java/com/sqx/modules/app/service/UserService.java b/src/main/java/com/sqx/modules/app/service/UserService.java index f13b3a7a..dd509f23 100644 --- a/src/main/java/com/sqx/modules/app/service/UserService.java +++ b/src/main/java/com/sqx/modules/app/service/UserService.java @@ -233,4 +233,6 @@ public interface UserService extends IService { * 用户行为 */ void addBlackUser(Long userId,String behavior); + + UserEntity queryByInvitationCodeOrUserId(Long inviterUserId, String invitationCode); } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 90f44882..b907b8f6 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -473,7 +473,8 @@ public class UserServiceImpl extends ServiceImpl implements if (StringUtils.isEmpty(userInfo1.getInviterCode())) { userInfo1.setInviterCode(commonInfoService.findOne(88).getValue()); } - UserEntity userEntity = queryByInvitationCode(userInfo1.getInviterCode()); + UserEntity userEntity = queryByInvitationCodeOrUserId(userInfo1.getInviterUserId(), userInfo1.getInviterCode()); +// UserEntity userEntity = queryByInvitationCode(userInfo1.getInviterCode()); if (userEntity != null && StringUtils.isEmpty(userInfo1.getQdCode())) { userInfo1.setQdCode(userEntity.getQdCode()); } @@ -763,7 +764,8 @@ public class UserServiceImpl extends ServiceImpl implements if (StringUtils.isEmpty(userInfo1.getInviterCode())) { userInfo1.setInviterCode(commonInfoService.findOne(88).getValue()); } - UserEntity userEntity = queryByInvitationCode(userInfo1.getInviterCode()); + UserEntity userEntity = queryByInvitationCodeOrUserId(userInfo1.getInviterUserId(), userInfo1.getInviterCode()); +// UserEntity userEntity = queryByInvitationCode(userInfo1.getInviterCode()); //没有则生成新账号 userInfo1.setCreateTime(date); userInfo1.setPlatform("抖音"); @@ -858,7 +860,8 @@ public class UserServiceImpl extends ServiceImpl implements if (StringUtils.isEmpty(userInfo1.getInviterCode())) { userInfo1.setInviterCode(commonInfoService.findOne(88).getValue()); } - UserEntity userEntity = queryByInvitationCode(userInfo1.getInviterCode()); + UserEntity userEntity = queryByInvitationCodeOrUserId(userInfo1.getInviterUserId(), userInfo1.getInviterCode()); +// UserEntity userEntity = queryByInvitationCode(userInfo1.getInviterCode()); //没有则生成新账号 userInfo1.setCreateTime(date); userInfo1.setPlatform("快手"); @@ -957,7 +960,8 @@ public class UserServiceImpl extends ServiceImpl implements } } else { userInfo.setInviterCode(commonInfoService.findOne(88).getValue()); - userEntity = queryByInvitationCode(userInfo.getInviterCode()); + userEntity = queryByInvitationCodeOrUserId(userInfo.getInviterUserId(), userInfo.getInviterCode()); +// userEntity = queryByInvitationCode(userInfo.getInviterCode()); } SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String time = simpleDateFormat.format(new Date()); @@ -1673,4 +1677,13 @@ public class UserServiceImpl extends ServiceImpl implements .set(UserEntity::getPlatform, behavior) .set(UserEntity::getUpdateTime,DateUtil.now())); } + + @Override + public UserEntity queryByInvitationCodeOrUserId(Long inviterUserId, String invitationCode) { + if (inviterUserId == null) { + return baseMapper.selectOne(new QueryWrapper().eq("invitation_code", invitationCode)); + } + + return baseMapper.selectOne(new LambdaQueryWrapper().eq(UserEntity::getUserId, inviterUserId)); + } } diff --git a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java index 87916fa8..bd8b84f3 100644 --- a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java +++ b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java @@ -189,7 +189,8 @@ public class InviteServiceImpl extends ServiceImpl implements invite.setUserType(1); inviteDao.insert(invite); //同步二级 - UserEntity two = userService.queryByInvitationCode(userEntity.getInviterCode()); + UserEntity two = userService.queryByInvitationCodeOrUserId(userEntity.getInviterUserId(), userEntity.getInviterCode()); +// UserEntity two = userService.queryByInvitationCode(userEntity.getInviterCode()); if (two != null) { invite = new Invite(); invite.setState(0); @@ -203,6 +204,7 @@ public class InviteServiceImpl extends ServiceImpl implements UserEntity user = new UserEntity(); user.setUserId(userId); user.setInviterCode(userEntity.getInvitationCode()); + user.setInviterUserId(userEntity.getUserId()); userService.updateById(user); // 金币 @@ -318,7 +320,8 @@ public class InviteServiceImpl extends ServiceImpl implements result.put("oneUserId", userEntity.getUserId()); result.put("oneMoney", money); } - UserEntity two = userService.queryByInvitationCode(userEntity.getInviterCode()); + UserEntity two = userService.queryByInvitationCodeOrUserId(userEntity.getInviterUserId(), userEntity.getInviterCode()); +// UserEntity two = userService.queryByInvitationCode(userEntity.getInviterCode()); if (two != null) { Invite invite2 = inviteDao.selectInviteByUser(two.getUserId(), userId, 2); if (invite2 == null) { 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 dafcac87..c29c9f50 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -162,7 +162,8 @@ public class TempOrdersTask { ordersService.insertOrders(order); UserEntity user = userService.selectUserById(order.getUserId()); - UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); + UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode()); +// UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); if (byUser != null) { InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(user.getUserId()); if (inviteAchievement == null) { diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index b0c40bce..7110204e 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -122,7 +122,8 @@ public class AliPayController { orders.setPayTime(DateUtils.format(new Date())); UserEntity user = userService.selectUserById(orders.getUserId()); - UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); + UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode()); +// UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); Map map = inviteService.updateInvite(byUser, format, user.getUserId(), orders.getPayMoney()); Object oneUserId = map.get("oneUserId"); if (oneUserId != null) { diff --git a/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java index a1996d5e..03278ec8 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java @@ -415,7 +415,8 @@ public class DyServiceImpl implements DyService { ordersService.fillSysUserId(orders); ordersService.updateById(orders); UserEntity user = userService.selectUserById(orders.getUserId()); - UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); + UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode()); +// UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); Map map = inviteService.updateInvite(byUser, format, user.getUserId(), orders.getPayMoney()); Object oneUserId = map.get("oneUserId"); if(oneUserId!=null){ @@ -507,7 +508,8 @@ public class DyServiceImpl implements DyService { ordersService.fillSysUserId(orders); ordersService.updateById(orders); UserEntity user = userService.selectUserById(orders.getUserId()); - UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); + UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode()); +// UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); Map map = inviteService.updateInvite(byUser, format, user.getUserId(), orders.getPayMoney()); Object oneUserId = map.get("oneUserId"); if(oneUserId!=null){ diff --git a/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java index e177ff88..f3acd758 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java @@ -191,7 +191,8 @@ public class KsServiceImpl implements KsService { ordersService.fillSysUserId(orders); ordersService.updateById(orders); UserEntity user = userService.selectUserById(orders.getUserId()); - UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); + UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode()); +// UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); Map map = inviteService.updateInvite(byUser, format, user.getUserId(), orders.getPayMoney()); Object oneUserId = map.get("oneUserId"); if(oneUserId!=null){ diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index 1d787041..3090b97e 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -286,7 +286,8 @@ public class WxServiceImpl implements WxService { orders.setStatus(1); orders.setPayTime(DateUtils.format(new Date())); UserEntity user = userService.selectUserById(orders.getUserId()); - UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); + UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode()); +// UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); Map map = inviteService.updateInvite(byUser, format, user.getUserId(), orders.getPayMoney()); Object oneUserId = map.get("oneUserId"); if(oneUserId!=null){ @@ -367,7 +368,8 @@ public class WxServiceImpl implements WxService { orders.setPayTime(DateUtils.format(new Date())); UserEntity user = userService.selectUserById(orders.getUserId()); - UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); + UserEntity byUser = userService.queryByInvitationCodeOrUserId(user.getInviterUserId(), user.getInviterCode()); +// UserEntity byUser = userService.queryByInvitationCode(user.getInviterCode()); Map map = inviteService.updateInvite(byUser, format, user.getUserId(), orders.getPayMoney()); Object oneUserId = map.get("oneUserId"); if(oneUserId!=null){