From a25a799a89dec7ec39890bc5327e4d0d585959e8 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 28 Apr 2024 14:40:25 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/EchoServices.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/EchoServices.java b/src/main/java/com/nq/service/impl/EchoServices.java
index 319c337..80d115b 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -114,21 +114,38 @@
// 本金*收益率*周期/365=收益金额
BigDecimal incomeAmount = money.multiply(rate);
BigDecimal aml = incomeAmount.add(money);
- if (aml.compareTo(BigDecimal.ZERO) > 0) {
- UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
- .eq(UserAssets::getUserId, orderEchoBean.getUserId())
- .eq(UserAssets::getAccectType, "IN")
- );
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(aml));
- userAssetsMapper.updateById(userAssets);
- orderEchoBean.setState("2");
- orderEchoBean.setEarnings(incomeAmount.toString());
- orderEchoMapper.updateById(orderEchoBean);
+ UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
+ .eq(UserAssets::getUserId, orderEchoBean.getUserId())
+ .eq(UserAssets::getAccectType, "IN")
+ );
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ continue;
}
+ BigDecimal subtract = aml.subtract(userAssets.getAmountToBeCovered());
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ if(subtract.compareTo(BigDecimal.ZERO) > 0){
+ userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtract));
+ }else{
+ userAssets.setAmountToBeCovered(subtract.negate());
+ }
+ }else{
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(aml));
+ }
+ userAssetsMapper.updateById(userAssets);
+ orderEchoBean.setState("2");
+ orderEchoBean.setEarnings(incomeAmount.toString());
+ orderEchoMapper.updateById(orderEchoBean);
}
}
+ public static void main(String[] args) {
+ BigDecimal a = new BigDecimal("20");
+ BigDecimal b = new BigDecimal("-100");
+ System.out.println(a.add(b));
+ }
+
@Override
public int insertEcho(EChoBean eChoBean) {
return eChoMapper.insert(eChoBean);
--
Gitblit v1.9.3