From 362c1af8bcafedd15dcd81e72fb6888b93e5000b Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 14 May 2024 16:23:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/EchoServices.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 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..29e0f66 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -7,10 +7,7 @@
import com.nq.dao.UserAssetsMapper;
import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
-import com.nq.pojo.EChoBean;
-import com.nq.pojo.OrderEchoBean;
-import com.nq.pojo.User;
-import com.nq.pojo.UserAssets;
+import com.nq.pojo.*;
import com.nq.pojo.reponse.OrderEChoReponse;
import com.nq.service.IEchoServices;
import com.nq.service.IUserService;
@@ -79,13 +76,14 @@
.eq(UserAssets::getAccectType, "IN")
);
userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(money));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(money));
userAssetsMapper.updateById(userAssets);
return orderEchoMapper.insert(orderEchoBean) >= 1;
}
}
@Override
- public List<OrderEchoBean> queryOrderEcho(HttpServletRequest request) {
+ public List<OrderEchoOut> queryOrderEcho(HttpServletRequest request) {
User user = this.iUserService.getCurrentRefreshUser(request);
if (user == null) {
return new ArrayList<>();
@@ -114,21 +112,39 @@
// 本金*收益率*周期/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));
+ }
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(money));
+ 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