zm/nuttyreading-global-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台新增妇幼生殖VIP、批量开课bug修改

Browse Source
This commit is contained in:
wyn
2026-06-10 17:33:28 +08:00
parent f7f835df9f
commit 333c54ab03
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/peanut/modules/book/controller/MyUserController.java
View File

@@ -84,8 +84,8 @@ public class MyUserController {
if (!StringUtils.isEmpty(p.getVipType())){
if ("1".equals(p.getVipType())){
List<Map<String,Object>> list = userVipService.listMaps(new MPJLambdaWrapper<UserVip>().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<Integer> 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);

2
src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java
View File

@@ -378,7 +378,7 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
vipBuyConfigEntity.getType()==71||vipBuyConfigEntity.getType()==81||vipBuyConfigEntity.getType()==101){
List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>()
.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) {

2
src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java
View File

@@ -223,7 +223,7 @@ public class UserCourseBuyServiceImpl extends ServiceImpl<UserCourseBuyDao, User
CellType cellTypeEnum = cell.getCellTypeEnum();
// if(cellTypeEnum==CellType.NUMERIC){
String phone = cell.toString();
MyUserEntity myUserEntity = userDao.selectOne(new LambdaQueryWrapper<MyUserEntity>().select(MyUserEntity::getId,MyUserEntity::getName,MyUserEntity::getTel).eq(MyUserEntity::getTel, phone));
MyUserEntity myUserEntity = userDao.selectOne(new LambdaQueryWrapper<MyUserEntity>().select(MyUserEntity::getId,MyUserEntity::getName,MyUserEntity::getTel).eq(MyUserEntity::getEmail, phone));
if(myUserEntity!=null){
has.add(myUserEntity);
}else{