diff --git a/pom.xml b/pom.xml index 66a98fb..6b34257 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.imyeyu.timiserverapi TimiServerAPI - 1.0.51 + 1.0.52 jar TimiServerAPI imyeyu.com API diff --git a/src/main/java/com/imyeyu/api/modules/gao/vo/GaoSalesOrderPage.java b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoSalesOrderPage.java index 576978c..c9d553a 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/vo/GaoSalesOrderPage.java +++ b/src/main/java/com/imyeyu/api/modules/gao/vo/GaoSalesOrderPage.java @@ -5,6 +5,8 @@ import com.imyeyu.java.bean.BasePage; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /// GAO 销售订单分页请求 /// /// @author Codex @@ -25,15 +27,27 @@ public class GaoSalesOrderPage extends BasePage { /// 订单类型 private GaoSalesOrder.OrderType orderType; + /// 订单类型列表 + private List orderTypeList; + /// 订单状态 private GaoSalesOrder.Status status; + /// 订单状态列表 + private List statusList; + /// 付款状态 private GaoSalesOrder.PaymentStatus paymentStatus; + /// 付款状态列表 + private List paymentStatusList; + /// 退款状态 private GaoSalesOrder.RefundStatus refundStatus; + /// 退款状态列表 + private List refundStatusList; + /// true 为筛选可收款且未付清订单 private Boolean pendingReceive; diff --git a/src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml b/src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml index dd4e975..3eb49ad 100644 --- a/src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml +++ b/src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml @@ -31,10 +31,42 @@ AND cp.`deleted_at` IS NULL ) - AND o.`order_type` = #{orderType} - AND o.`status` = #{status} - AND o.`payment_status` = #{paymentStatus} - AND o.`refund_status` = #{refundStatus} + + + AND o.`order_type` IN + + #{orderTypeItem} + + + AND o.`order_type` = #{orderType} + + + + AND o.`status` IN + + #{statusItem} + + + AND o.`status` = #{status} + + + + AND o.`payment_status` IN + + #{paymentStatusItem} + + + AND o.`payment_status` = #{paymentStatus} + + + + AND o.`refund_status` IN + + #{refundStatusItem} + + + AND o.`refund_status` = #{refundStatus} + AND o.`status` IN ('ACTIVE', 'FULFILLED') AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID') AND o.`status` = 'FULFILLED' AND o.`paid_amount` < o.`sale_amount` AND (o.`order_no` LIKE CONCAT('%', #{keyword}, '%') OR c.`name` LIKE CONCAT('%', #{keyword}, '%') OR c.`code` LIKE CONCAT('%', #{keyword}, '%'))