timi/TimiServerAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 57 Wiki Activity

v1.0.51 #63

Merged
timi merged 3 commits from dev into master 2026-09-18 17:27:14 +00:00
Conversation 0 Commits 3 Files Changed 12
+11
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 76c5495c32 - Show all commits
src/main/java/com/imyeyu/api/modules/gao/vo/GaoSalesOrderPage.java
+3
View File
@@ -19,6 +19,9 @@ public class GaoSalesOrderPage extends BasePage {
/// 客户 ID /// 客户 ID
private String customerId; private String customerId;
/// 套餐配置 ID
private String packageConfigId;
/// 订单类型 /// 订单类型
private GaoSalesOrder.OrderType orderType; private GaoSalesOrder.OrderType orderType;
src/main/resources/mapper/timi-server/gao/GaoSalesOrderMapper.xml
+8
View File
@@ -23,6 +23,14 @@
o.`deleted_at` IS NULL o.`deleted_at` IS NULL
<if test="storeId != null and storeId != ''">AND o.`store_id` = #{storeId}</if> <if test="storeId != null and storeId != ''">AND o.`store_id` = #{storeId}</if>
<if test="customerId != null and customerId != ''">AND o.`customer_id` = #{customerId}</if> <if test="customerId != null and customerId != ''">AND o.`customer_id` = #{customerId}</if>
<if test="packageConfigId != null and packageConfigId != ''">
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
)
</if>
<if test="orderType != null">AND o.`order_type` = #{orderType}</if> <if test="orderType != null">AND o.`order_type` = #{orderType}</if>
<if test="status != null">AND o.`status` = #{status}</if> <if test="status != null">AND o.`status` = #{status}</if>
<if test="paymentStatus != null">AND o.`payment_status` = #{paymentStatus}</if> <if test="paymentStatus != null">AND o.`payment_status` = #{paymentStatus}</if>