From 215a413fa2bb598cc70c71a0c9691925f814f90b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 07 八月 2024 09:07:47 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 402aeac..3dcd623 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -31,7 +31,15 @@
where
date(a.create_time) BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
</select>
-
+
+ <select id="selectMaxOrderIdByYear">
+ select
+ ifnull(SUBSTR(max(order_id) from 5),0)
+ from
+ `order` as a
+ where
+ year(a.create_time) = year(NOW())
+ </select>
<update id="updateOrderParameter">
update `order` o
@@ -276,7 +284,7 @@
</update>
<update id="updateMoney">
- update `order` set money = #{order.money},calculate_type = #{order.calculateType} where order_id = #{order.orderId}
+ update `order` set money = #{order.money},calculate_type = #{order.calculateType},other_money=#{order.otherMoney} where order_id = #{order.orderId}
</update>
<update id="cancelOrder">
--
Gitblit v1.8.0