|
|
|
@ -102,7 +102,7 @@ public class OrderService {
|
|
|
|
|
QueryWrapper<OrderEntity> wrapper = new QueryWrapper<>();
|
|
|
|
|
wrapper.eq(StrUtil.isNotBlank(orderFilterRequest.getId()), "orderId", orderFilterRequest.getId())
|
|
|
|
|
.or(StrUtil.isNotBlank(orderFilterRequest.getId()))
|
|
|
|
|
.eq(StrUtil.isNotBlank(orderFilterRequest.getId()),"corpOrderId", orderFilterRequest.getId())
|
|
|
|
|
.eq(StrUtil.isNotBlank(orderFilterRequest.getId()), "corpOrderId", orderFilterRequest.getId())
|
|
|
|
|
.in(CollUtil.isNotEmpty(orderFilterRequest.getInvCodes()), "locStorageCode", orderFilterRequest.getInvCodes())
|
|
|
|
|
.ge(StrUtil.isNotBlank(orderFilterRequest.getStartTime()), "actDate", orderFilterRequest.getStartTime())
|
|
|
|
|
.le(StrUtil.isNotBlank(orderFilterRequest.getEndTime()), "actDate", orderFilterRequest.getEndTime())
|
|
|
|
@ -116,7 +116,8 @@ public class OrderService {
|
|
|
|
|
.eq(null != orderFilterRequest.getCustomerId(), "customerId", orderFilterRequest.getCustomerId())
|
|
|
|
|
.eq(StrUtil.isNotBlank(orderFilterRequest.getCorpOrderId()), "corpOrderId", orderFilterRequest.getCorpOrderId())
|
|
|
|
|
.eq(null != orderFilterRequest.getReceiveStatus(), "receiveStatus", orderFilterRequest.getReceiveStatus())
|
|
|
|
|
.ne(null == orderFilterRequest.getReceiveStatus() && ConstantStatus.ORDER_STATUS_SUCCESS.equals(orderFilterRequest.getStatus()), "receiveStatus", ConstantStatus.RECEIVE_UN);
|
|
|
|
|
.ne(null == orderFilterRequest.getReceiveStatus() && ConstantStatus.ORDER_STATUS_SUCCESS.equals(orderFilterRequest.getStatus()), "receiveStatus", ConstantStatus.RECEIVE_UN)
|
|
|
|
|
.orderByDesc("actDate");
|
|
|
|
|
return wrapper;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|