From 209ed077c07f53746761e5149c97345f62e38cc1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 02 八月 2024 18:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 7ce24b8..0349177 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -381,6 +381,7 @@
                     .eq("`column`",orderOtherMoney.getColumn()));
         });
         order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
+        order.setOtherMoney(orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
         orderMapper.updateMoney(order);
         orderDetailMapper.updateOrderMoney(OrderDetails);
         return false;

--
Gitblit v1.8.0