From 62a2e5583931e439b5914e39801173074e83e9ac Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 31 十二月 2025 13:57:39 +0800
Subject: [PATCH] 提交 订单其他金额列和金额重置方法业务调整
---
north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 6088f1d..984212a 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml
@@ -12,16 +12,33 @@
a.money,
a.create_time,
b.alias,
- b.id
+ b.id,
+ a.delivery_state
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
+
+ UNION ALL
+
+-- 鏌ヨ order_other_money 琛ㄤ腑 column 涓虹┖鐨勮褰�
+ SELECT
+ a.order_id,
+ null AS `column`,
+ a.quantity,
+ a.price,
+ a.money,
+ a.create_time,
+ a.alias, -- 浣跨敤 order_other_money 琛ㄤ腑鐨勫埆鍚�
+ a.id,
+ a.delivery_state
+ FROM order_other_money AS a
+ WHERE a.order_id = #{orderId}
+ AND (a.`column` IS NULL OR a.`column` = '')
</select>
<select id="selectGrossAmount">
select ifnull(sum(money),0) from order_other_money where order_id = #{orderId}
-
</select>
--
Gitblit v1.8.0