From 4dab23e4f826abd3d744c836054e4ddaac715d4d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 31 八月 2024 10:56:28 +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 | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 b4125de..3a03a09 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
@@ -25,6 +25,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -232,8 +233,10 @@
Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
int finalI = i;
-
if(otherColumns!=null){
+ otherColumns.values().removeIf(value -> value == null || value.equals(""));
+ OrderDetails.get(i).setOtherColumns(JSON.toJSONString(otherColumns));
+
otherColumns.forEach((key, value) ->{
if(value!=null && !value.equals("") && key.contains("M")) {
@@ -246,9 +249,10 @@
}
});
- }else if(OrderDetails.get(i).getOtherColumns()==null){
+ }else{
OrderDetails.get(i).setOtherColumns("{}");
}
+
}
@@ -384,6 +388,11 @@
BigDecimal getGrossAmount= BigDecimal.valueOf(orderDetail.getGrossAmount());
money+=getGrossAmount.doubleValue();
}
+ Log log = new Log();
+ log.setOperator(order.getCreator());
+ log.setOperatorId(order.getCreatorId());
+ log.setContent(jsonObject.toString());
+ log.setFunction("updateOrderMoney閲戦閲嶇疆:"+order.getOrderId());
orderOtherMoneyList.forEach(orderOtherMoney -> {
if(orderOtherMoney.getQuantity()!=null && orderOtherMoney.getPrice()!=null){
@@ -397,6 +406,7 @@
order.setOtherMoney(orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
orderMapper.updateMoney(order);
orderDetailMapper.updateOrderMoney(OrderDetails);
+ logService.saveLog(log);
return false;
}
--
Gitblit v1.8.0