xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
@@ -907,6 +907,10 @@ startTime = split[0]+" 00:00:00"; endTime = split[1]+" 23:59:59"; } List<Long> longs = new ArrayList<>(); longs.add(1L); longs.add(2L); longs.add(3L); LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>(); if (startTime!=null){ courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime); @@ -919,6 +923,8 @@ } if (StringUtils.hasLength(courseDTO.getOrderFrom())){ courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(","))); }else{ courseLambdaQueryWrapper.in(Order::getOrderFrom,longs); } courseLambdaQueryWrapper.eq(courseDTO.getUid()!=null&&(!courseDTO.getUid().isEmpty()),Order::getAppUserId, courseDTO.getUid()); if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){ @@ -1043,6 +1049,12 @@ } if (StringUtils.hasLength(courseDTO.getOrderFrom())){ courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(","))); }else{ List<Long> longs = new ArrayList<>(); longs.add(1L); longs.add(2L); longs.add(3L); courseLambdaQueryWrapper.in(Order::getOrderFrom,longs); } if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){ // 查询购买内容 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
@@ -1185,7 +1185,7 @@ byId.setUserStatus(3); byId.setLogoutTime(LocalDateTime.now()); appUserService.updateById(byId); appUserService.removeById(byId); // appUserService.removeById(byId); remoteUserService.removeByAppUserId(byId.getUserId()); return R.ok(); } xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/impl/AppUserServiceImpl.java
@@ -79,9 +79,11 @@ String device = dto.getDevice(); if (StringUtils.hasLength(dto.getDevice())) { Optional<AppUser> one = this.lambdaQuery() .ne(AppUser::getUserStatus,3) .eq(AppUser::getDevice, device) .isNull(AppUser::getCellPhone).oneOpt(); Optional<AppUser> appUser = this.lambdaQuery() .ne(AppUser::getUserStatus,3) .eq(Objects.nonNull(dto.getId()), AppUser::getId, dto.getId()) .eq(com.alibaba.nacos.common.utils.StringUtils.isNotBlank(dto.getAppleId()), AppUser::getAppleId, dto.getAppleId()) .eq(com.alibaba.nacos.common.utils.StringUtils.isNotBlank(dto.getCellPhone()), AppUser::getCellPhone,
