From eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 18 十月 2024 13:44:06 +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 | 23 +++++++++++++++++------
1 files changed, 17 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 fbe2e09..6088f1d 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml
@@ -5,12 +5,23 @@
<mapper namespace="com.example.erp.mapper.sd.OrderOtherMoneyMapper">
<select id="findById">
select
- a.*,
- b.alias
- from order_other_money as a
- left join basic_other_money as b
- on a.`column` = b.`column`
- where a.order_id = #{orderId}
+ a.order_id,
+ b.`column`,
+ a.quantity,
+ a.price,
+ a.money,
+ a.create_time,
+ b.alias,
+ b.id
+ 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 ifnull(sum(money),0) from order_other_money where order_id = #{orderId}
+
</select>
--
Gitblit v1.8.0