From bf2a0074e66bd9ac30b302594a45e9f3eb1e4116 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 27 十一月 2024 14:23:22 +0800
Subject: [PATCH] 569-供应商列表：1.序号ID修改为供应商ID，并移动到第一列 2.增加供应商ID查询框
---
src/main/resources/mapper/payment/OrderMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 4f847ac..ebaac79 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -162,6 +162,9 @@
<if test="condition.warehouseLocationCode != null and condition.warehouseLocationCode != ''">
AND q.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
</if>
+ <if test="condition.createName != null and condition.createName != ''">
+ AND u.nick_name LIKE concat('%', #{condition.createName},'%')
+ </if>
ORDER BY q.create_time desc, q.payment_time desc
</select>
@@ -374,8 +377,8 @@
<select id="getOrderSaleAmount" resultType="java.math.BigDecimal">
SELECT sum(o.payment_amount)
FROM t_order o
- WHERE o.payment_time is not null
- and o.refund_time is null
+ WHERE o.deleted=0
+ and o.status_backend not in ('PENDING','CANCEL','REFUND')
<if test="startTime != null">
and o.create_time > #{startTime}
</if>
--
Gitblit v1.9.3