From 333c54ab03696f0e4040b972284c12dfbf55ac88 Mon Sep 17 00:00:00 2001 From: wyn <1074145239@qq.com> Date: Wed, 10 Jun 2026 17:33:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E5=A6=87?= =?UTF-8?q?=E5=B9=BC=E7=94=9F=E6=AE=96VIP=E3=80=81=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=BC=80=E8=AF=BEbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/book/controller/MyUserController.java | 11 ++++------- .../common/service/impl/UserVipServiceImpl.java | 2 +- .../master/service/impl/UserCourseBuyServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java index 425f76a..c9b1436 100644 --- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java +++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java @@ -84,8 +84,8 @@ public class MyUserController { if (!StringUtils.isEmpty(p.getVipType())){ if ("1".equals(p.getVipType())){ List> list = userVipService.listMaps(new MPJLambdaWrapper().eq(UserVip::getState,0) - .in(UserVip::getType,4,5,6,9).groupBy(UserVip::getUserId) - .select("count(1) num,user_id userId ").having("num = 4")); + .in(UserVip::getType,4,5,6,9,10).groupBy(UserVip::getUserId) + .select("count(1) num,user_id userId ").having("num = 5")); List ids = list.stream().map(map -> (int)map.get("userId")).collect(Collectors.toList()); wrapper.in(MyUserEntity::getId,ids); }else if ("2".equals(p.getVipType())){ @@ -101,11 +101,8 @@ public class MyUserController { wrapper.eq(UserVip::getState,0); } } - wrapper.leftJoin(UserMigration.class,UserMigration::getUserId,MyUserEntity::getId); - wrapper.selectAll(MyUserEntity.class); - wrapper.selectAs(UserMigration::getCreateTime,"migrationTime"); - - wrapper.leftJoin(UserMigration.class,UserMigration::getUserId,MyUserEntity::getId); + wrapper.eq(MyUserEntity::getDelFlag, 0); + wrapper.disableSubLogicDel().leftJoin(UserMigration.class,UserMigration::getUserId,MyUserEntity::getId); wrapper.selectAll(MyUserEntity.class); wrapper.selectAs(UserMigration::getCreateTime,"migrationTime"); boolean isAsc = p.getSortValue().equals("")?false:(p.getSortValue().equals("ascending")?true:true); diff --git a/src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java index d21a097..c7dbcf9 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java @@ -378,7 +378,7 @@ public class UserVipServiceImpl extends ServiceImpl impleme vipBuyConfigEntity.getType()==71||vipBuyConfigEntity.getType()==81||vipBuyConfigEntity.getType()==101){ List userVipList = userVipDao.selectList(new LambdaQueryWrapper() .eq(UserVip::getUserId,buyOrder.getUserId()) - .eq(UserVip::getType,vipBuyConfigEntity.getType().toString().substring(0,1)) + .eq(UserVip::getType,vipBuyConfigEntity.getType().toString().substring(0,vipBuyConfigEntity.getType()==101?2:1)) .orderByDesc(UserVip::getEndTime)); UserVip userVip = userVipList.get(0); if (userVip.getState()==0) { diff --git a/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java index 8291d23..904aea6 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java @@ -223,7 +223,7 @@ public class UserCourseBuyServiceImpl extends ServiceImpl().select(MyUserEntity::getId,MyUserEntity::getName,MyUserEntity::getTel).eq(MyUserEntity::getTel, phone)); + MyUserEntity myUserEntity = userDao.selectOne(new LambdaQueryWrapper().select(MyUserEntity::getId,MyUserEntity::getName,MyUserEntity::getTel).eq(MyUserEntity::getEmail, phone)); if(myUserEntity!=null){ has.add(myUserEntity); }else{