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 4c87fcb..576978c 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 @@ -19,6 +19,9 @@ public class GaoSalesOrderPage extends BasePage { /// 客户 ID private String customerId; + /// 套餐配置 ID + private String packageConfigId; + /// 订单类型 private GaoSalesOrder.OrderType orderType; diff --git a/src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml b/src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml index ad5a835..ac7479a 100644 --- a/src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml +++ b/src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml @@ -23,6 +23,14 @@ o.`deleted_at` IS NULL AND o.`store_id` = #{storeId} AND o.`customer_id` = #{customerId} + + AND EXISTS ( + SELECT 1 FROM `gao_customer_package` cp + WHERE cp.`sales_order_id` = o.`id` + AND cp.`package_config_id` = #{packageConfigId} + AND cp.`deleted_at` IS NULL + ) + AND o.`order_type` = #{orderType} AND o.`status` = #{status} AND o.`payment_status` = #{paymentStatus}