From 1fc203f758ace853f4bfa900c422c2f741d09e79 Mon Sep 17 00:00:00 2001
From: yanghb <yangbhwork@163.com>
Date: 星期二, 18 二月 2025 09:05:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
land-system/src/main/java/com/zzg/system/service/state/impl/StateAssetServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/land-system/src/main/java/com/zzg/system/service/state/impl/StateAssetServiceImpl.java b/land-system/src/main/java/com/zzg/system/service/state/impl/StateAssetServiceImpl.java
index 48d7602..4987698 100644
--- a/land-system/src/main/java/com/zzg/system/service/state/impl/StateAssetServiceImpl.java
+++ b/land-system/src/main/java/com/zzg/system/service/state/impl/StateAssetServiceImpl.java
@@ -150,7 +150,9 @@
return;
}
//TODO 置换后金额含义
+ // 结算金额
Double dbSettleMoney = Objects.nonNull(stateSettlement.getSettlementMoney()) ? stateSettlement.getSettlementMoney() : 0;
+ //置换后金额
Double dbExchangeMoney = Objects.nonNull(stateSettlement.getExchangeMoney()) ? stateSettlement.getExchangeMoney() : 0;
BigDecimal settleMoney = BigDecimal.valueOf(dbSettleMoney + dbExchangeMoney).setScale(4, RoundingMode.HALF_UP);
data.setSettleMoney(settleMoney);
--
Gitblit v1.7.1