|
|
|
@ -70,8 +70,12 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
if (!OrderStatusEnum.PENDING.equals(recycleOrderQuery.getStatus())) {
|
|
|
|
|
wrapper.eq(RecycleOrder::getStaffsId, recycleOrderQuery.getUserId());
|
|
|
|
|
}
|
|
|
|
|
// 必须有订单状态查询
|
|
|
|
|
wrapper.eq(true, RecycleOrder::getOrderStatus, recycleOrderQuery.getStatus());
|
|
|
|
|
// 订单状态查询
|
|
|
|
|
if (OrderStatusEnum.UNPROCESSED.equals(recycleOrderQuery.getStatus())) { // 进行中
|
|
|
|
|
wrapper.in(RecycleOrder::getOrderStatus, OrderStatusEnum.UNPROCESSED.getCode(), OrderStatusEnum.RECYCLING.getCode());
|
|
|
|
|
} else {
|
|
|
|
|
wrapper.eq(RecycleOrder::getOrderStatus, recycleOrderQuery.getStatus());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
wrapper.eq(StrUtil.isNotEmpty(recycleOrderQuery.getId()), RecycleOrder::getId, recycleOrderQuery.getId());
|
|
|
|
|
Page<RecycleOrder> pageDO = recycleOrderQuery.addOrderItem(RecycleOrder::getCreatorTime).buildPage();
|
|
|
|
|