From 678b09f6a6b8ded3b0c173a3c7c99f72429a69a8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 17:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index aa41f37..4be8e48 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -62,7 +62,7 @@
point,
order_status as status,
distribution_mode as distributionMode
- from t_order where del_flag = 0 and pay_status = 2
+ from t_order where del_flag = 0 and pay_status = 2 and end_time is not null and distribution_mode != 2
<if test="null != item.code and '' != item.code">
and order_number like CONCAT('%', #{item.code}, '%')
</if>
--
Gitblit v1.7.1