diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java index c651859..7addcd7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java @@ -26,11 +26,21 @@ public class SearchShopOrderQuery extends AbstractPageQuery { private Date payTime; private String paymentMethod; private String corpid; + private Integer returnStatus; @Override public QueryWrapper addQueryCondition() { QueryWrapper queryWrapper = new QueryWrapper<>(); + if (returnStatus != null) { + if (returnStatus.equals(1)) { + queryWrapper.eq("o.pay_status", 2) + .eq("og.status", 2); + } else { + queryWrapper.eq("o.pay_status", 2) + .eq("og.status", 1); + } + } queryWrapper .eq(orderId != null, "o.order_id", orderId) .eq(cellId != null, "og.cell_id", cellId)