|
|
|
@ -96,7 +96,7 @@ public class OrderService {
|
|
|
|
|
.ge(StrUtil.isNotBlank(orderFilterRequest.getEndTime()), "actDate", orderFilterRequest.getEndTime())
|
|
|
|
|
.eq(StrUtil.isNotBlank(orderFilterRequest.getIsError()), "status", orderFilterRequest.getStatus())
|
|
|
|
|
.eq(StrUtil.isNotBlank(orderFilterRequest.getAction()), "action", orderFilterRequest.getAction())
|
|
|
|
|
.ne(StrUtil.isBlank(orderFilterRequest.getAction()), "action", orderFilterRequest.getAction())
|
|
|
|
|
.ne(StrUtil.isBlank(orderFilterRequest.getAction()), "action", "StockCheck")
|
|
|
|
|
.eq(StrUtil.isNotBlank(orderFilterRequest.getOrderId()), "orderId", orderFilterRequest.getOrderId())
|
|
|
|
|
.eq(StrUtil.isNotBlank(orderFilterRequest.getMainAction()), "mainAction", orderFilterRequest.getMainAction())
|
|
|
|
|
.eq(null != orderFilterRequest.getStatus(), "status", orderFilterRequest.getStatus())
|
|
|
|
|