Commit fc004c55 by zhangxingmin

push

parent 160da9b3
...@@ -92,7 +92,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService { ...@@ -92,7 +92,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
.filter(Objects::nonNull) .filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal fortuneAmount = fortuneAccount.getAmount() != null ? fortuneAccount.getAmount() : BigDecimal.ZERO; BigDecimal fortuneAmount = fortuneAccount.getHkdAmount() != null ? fortuneAccount.getHkdAmount() : BigDecimal.ZERO;
beSplitAmount = fortuneAmount.subtract(splitTotal); beSplitAmount = fortuneAmount.subtract(splitTotal);
if (beSplitAmount.compareTo(BigDecimal.ZERO) < 0) { if (beSplitAmount.compareTo(BigDecimal.ZERO) < 0) {
beSplitAmount = BigDecimal.ZERO; // 防止负数 beSplitAmount = BigDecimal.ZERO; // 防止负数
...@@ -161,7 +161,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService { ...@@ -161,7 +161,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
.filter(Objects::nonNull) .filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal fortuneAmount = fortuneAccount.getAmount() != null ? fortuneAccount.getAmount() : BigDecimal.ZERO; BigDecimal fortuneAmount = fortuneAccount.getHkdAmount() != null ? fortuneAccount.getHkdAmount() : BigDecimal.ZERO;
beSplitAmount = fortuneAmount.subtract(splitTotal); beSplitAmount = fortuneAmount.subtract(splitTotal);
if (beSplitAmount.compareTo(BigDecimal.ZERO) < 0) { if (beSplitAmount.compareTo(BigDecimal.ZERO) < 0) {
beSplitAmount = BigDecimal.ZERO; // 防止负数 beSplitAmount = BigDecimal.ZERO; // 防止负数
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment