From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml
index 3941714..6088f1d 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml
@@ -6,21 +6,21 @@
<select id="findById">
select
a.order_id,
- a.`column`,
+ b.`column`,
a.quantity,
a.price,
a.money,
a.create_time,
b.alias,
b.id
- from order_other_money as a
- left join basic_other_money as b
- on a.`column` = b.`column`
- where a.order_id = #{orderId}
+ from basic_other_money as b
+ left join order_other_money as a
+ on a.`column` = b.`column` and a.order_id = #{orderId}
+ where b.`column` like 'M%' and b.state=1
</select>
<select id="selectGrossAmount">
- select sum(money) from order_other_money where order_id = #{orderId}
+ select ifnull(sum(money),0) from order_other_money where order_id = #{orderId}
</select>
--
Gitblit v1.8.0