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 | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/EchoServices.java b/src/main/java/com/nq/service/impl/EchoServices.java
index 75755a8..80d115b 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -14,6 +14,7 @@
import com.nq.pojo.reponse.OrderEChoReponse;
import com.nq.service.IEchoServices;
import com.nq.service.IUserService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@
import java.util.ArrayList;
import java.util.List;
+@Slf4j
@Service
public class EchoServices implements IEchoServices {
@@ -43,11 +45,11 @@
@Override
public List<EChoBean> queryList() {
- return eChoMapper.selectQueryAll();
+ return eChoMapper.selectList(new LambdaQueryWrapper<EChoBean>());
}
@Override
- public boolean buyECho(String eId, Integer money, HttpServletRequest request) {
+ public boolean buyECho(String eId, BigDecimal money, HttpServletRequest request) {
User user = this.iUserService.getCurrentRefreshUser(request);
@@ -76,7 +78,7 @@
.eq(UserAssets::getUserId, orderEchoBean.getUserId())
.eq(UserAssets::getAccectType, "IN")
);
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(new BigDecimal(money)));
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(money));
userAssetsMapper.updateById(userAssets);
return orderEchoMapper.insert(orderEchoBean) >= 1;
}
@@ -102,6 +104,7 @@
queryWrapper.eq("state", 1);
queryWrapper.lt("end_time", System.currentTimeMillis());
List<OrderEchoBean> list = orderEchoMapper.selectList(queryWrapper);
+ log.info("基金定时任务执行数量:{}",list.size());
for (OrderEchoBean orderEchoBean : list) {
BigDecimal money = new BigDecimal(orderEchoBean.getMoney()); // 本金
BigDecimal rate = new BigDecimal(orderEchoBean.getReturnOfRate()); // 收益率
@@ -111,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