|
|
|
@ -69,7 +69,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
wrapper.eq(RecycleOrder::getRecycleStationId, recycleOrderQuery.getStationId());
|
|
|
|
|
// 不为待接单状态时, 只查自己的订单
|
|
|
|
|
if (!OrderStatusEnum.PENDING.equals(recycleOrderQuery.getStatus())) {
|
|
|
|
|
wrapper.eq(RecycleOrder::getStaffsId, recycleOrderQuery.getId());
|
|
|
|
|
wrapper.eq(RecycleOrder::getStaffsId, recycleOrderQuery.getUserId());
|
|
|
|
|
}
|
|
|
|
|
// 必须有订单状态查询
|
|
|
|
|
wrapper.eq(true, RecycleOrder::getOrderStatus, recycleOrderQuery.getStatus());
|
|
|
|
|