From 095f37ff949a43fe51fdf90a7a5acb2fe508f205 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 22 Sep 2025 21:27:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/EchoServices.java | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 57 insertions(+), 30 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..07cf897 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -5,12 +5,10 @@
import com.nq.dao.EChoMapper;
import com.nq.dao.OrderEchoMapper;
import com.nq.dao.UserAssetsMapper;
+import com.nq.dao.UserPositionMapper;
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;
@@ -42,6 +40,9 @@
@Autowired
private UserAssetsMapper userAssetsMapper;
+
+ @Autowired
+ private UserPositionMapper userPositionMapper;
@Override
public List<EChoBean> queryList() {
@@ -76,16 +77,17 @@
UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
.eq(UserAssets::getUserId, orderEchoBean.getUserId())
- .eq(UserAssets::getAccectType, "IN")
+ .eq(UserAssets::getAccectType, "JP")
);
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<>();
@@ -100,35 +102,60 @@
@Override
public void sendMoney() {
- QueryWrapper<OrderEchoBean> queryWrapper = new QueryWrapper<>();
- 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()); // 收益率
- // 将rate除以100，并向上取整
- rate = rate.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+ try {
+ QueryWrapper<OrderEchoBean> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("state", 1);
+ queryWrapper.lt("end_time", System.currentTimeMillis());
+ List<OrderEchoBean> list = orderEchoMapper.selectList(queryWrapper);
+ log.info("基金定时任务执行数量:{}", list.size());
+ for (OrderEchoBean orderEchoBean : list) {
+ try {
+ BigDecimal money = new BigDecimal(orderEchoBean.getMoney()); // 本金
+ BigDecimal rate = new BigDecimal(orderEchoBean.getReturnOfRate()); // 收益率
+ // 将rate除以100，并向上取整
+ rate = rate.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
- // 本金*收益率*周期/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);
+ // 本金*收益率*周期/365=收益金额
+ BigDecimal incomeAmount = money.multiply(rate);
+ BigDecimal aml = incomeAmount.add(money);
+ UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
+ .eq(UserAssets::getUserId, orderEchoBean.getUserId())
+ .eq(UserAssets::getAccectType, "JP")
+ );
+ 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));
+ }
+ UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
+ if(null != userPosition){
+ userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered());
+ userPositionMapper.updateById(userPosition);
+ }
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(money));
+ userAssetsMapper.updateById(userAssets);
+ orderEchoBean.setState("2");
+ orderEchoBean.setEarnings(incomeAmount.toString());
+ orderEchoMapper.updateById(orderEchoBean);
+ } catch (Exception e) {
+ log.error("基金定时任务---失败: " + orderEchoBean.getId(), e);
+ }
}
+ } catch (Exception ex) {
+ log.error("基金定时任务---失败: ", ex);
}
-
}
+
@Override
public int insertEcho(EChoBean eChoBean) {
return eChoMapper.insert(eChoBean);
--
Gitblit v1.9.3