irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2025-02-21 15:42:53 +08:00
parent 27e984ee7b
commit 0119d81482
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoQueryVo.java
View File

@@ -39,7 +39,7 @@ public class PlayOrderInfoQueryVo extends BasePageEntity {
/** /**
* 订单类型【-1:退款订单;0:充值订单；1:提现订单；2:普通订单】 * 订单类型【-1:退款订单;0:充值订单；1:提现订单；2:普通订单】
*/ */
private String orderType = "2"; private String orderType;
/** /**
* 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单） * 下单类型（-1:其他类型;0:指定单;1:随机单;2:打赏单）

6
play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
View File

@@ -496,9 +496,9 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
if (StringUtils.isNotBlank(vo.getOrderType())) { if (StringUtils.isNotBlank(vo.getOrderType())) {
lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderType, vo.getOrderType()); lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderType, vo.getOrderType());
} }
// 加入组员的筛选 // 加入组员的筛选，要么acceptBy为空，要么就在in里面
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), vo.getClerkNickName()); List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser(), vo.getClerkNickName());
lambdaQueryWrapper.in(PlayOrderInfoEntity::getAcceptBy, clerkIdList); lambdaQueryWrapper.and(i -> i.isNull(PlayOrderInfoEntity::getAcceptBy).or().in(PlayOrderInfoEntity::getAcceptBy, clerkIdList));
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper); return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper);
} }
@@ -631,7 +631,7 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
if (StringUtils.isNotBlank(entity.getOrderType())) { if (StringUtils.isNotBlank(entity.getOrderType())) {
lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderType, entity.getOrderType()); lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderType, entity.getOrderType());
} }
lambdaQueryWrapper.orderByDesc(PlayOrderInfoEntity::getPurchaserTime); lambdaQueryWrapper.orderByDesc(PlayOrderInfoEntity::getCreatedTime);
return lambdaQueryWrapper; return lambdaQueryWrapper;
} }