From decfc2ff7244cec365d3f32a5090edf5faeae861 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 23 Apr 2025 19:08:18 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 162 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index db2dc98..88ec26c 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -1,8 +1,9 @@
package com.nq.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nq.common.ServerResponse;
import com.nq.dao.*;
import com.nq.enums.EStockType;
@@ -10,18 +11,21 @@
import com.nq.pojo.*;
import com.nq.service.IUserAssetsServices;
import com.nq.utils.KeyUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
/**
* 用户资产
*/
+@Slf4j
@Service
public class UserAssetsServices implements IUserAssetsServices {
@@ -78,10 +82,12 @@
if(type.equals("0")){
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = bigAmt.subtract(userAssets.getAmountToBeCovered());
- if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
+ availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
+ if(availableBalance.compareTo(BigDecimal.ZERO) >= 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
if(null != userPosition){
userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered());
}
@@ -139,7 +145,7 @@
userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
userRecharge.setAddTime(new Date());
userRecharge.setPayTime(new Date());
- userRecharge.setOrderStatus(Integer.valueOf(1));
+ userRecharge.setOrderStatus(Integer.valueOf(0));
userRecharge.setPayId(1);
userRechargeMapper.insert(userRecharge);
}
@@ -178,9 +184,11 @@
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT.getCode())){
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
- if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
+ availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
+ if(availableBalance.compareTo(BigDecimal.ZERO) >= 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
}else{
BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(amount);
userAssets.setAmountToBeCovered(amountToBeCovered);
@@ -197,23 +205,31 @@
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TOP_UP.getCode())){
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
- if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
+ availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
+ if(availableBalance.compareTo(BigDecimal.ZERO) >= 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
}else{
- BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(amount);
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
- userAssets.setAmountToBeCovered(amountToBeCovered);
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
+ userAssets.setAmountToBeCovered(availableBalance.negate());
}
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
}
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.WITHDRAW.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.abs()));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.HANDLING_CHARGE.getCode())){
+ if(userAssets.getAvailableBalance().compareTo(amount.abs()) >= 0){
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+ }else {
+ userAssets.setHandlingChargeWritten(userAssets.getHandlingChargeWritten().add(amount.abs()));
+ }
userAssets.setHandlingCharge(userAssets.getHandlingCharge().add(amount.abs()));
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+
extracted(amount.negate(),userAssets);
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CONSTRAINT_CLOSE_POSITION.getCode())){
userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
@@ -226,7 +242,7 @@
}
if(null != userPosition){
- userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered());
+ userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten()));
userPositionMapper.updateById(userPosition);
}
String after = userAssets.getAvailableBalance().toString();
@@ -242,6 +258,95 @@
moneyLog.setCreateTime(new Date());
moneyLogMapper.insert(moneyLog);
return userAssetsMapper.updateById(userAssets)>1;
+ }
+
+ @Override
+ @Transactional
+ public ServerResponse transfer(Integer userId, String disbursementAccount, String depositAccount, String amt, HttpServletRequest request) {
+ // 参数校验
+ ServerResponse paramCheckResponse = checkParameters(userId, disbursementAccount, depositAccount, amt, request);
+ if (paramCheckResponse != null) {
+ return paramCheckResponse;
+ }
+
+ // 转账金额合法性检查
+ BigDecimal transferAmount = validateTransferAmount(amt, request);
+ if (transferAmount == null) {
+ return ServerResponse.createByErrorMsg("无效的转账金额", request);
+ }
+
+ // 查询转出账户和转入账户的资产信息
+ UserAssets disbursement = getUserAssets(userId, disbursementAccount);
+ UserAssets deposit = getUserAssets(userId, depositAccount);
+
+ // 账户检查
+ if (disbursement == null) {
+ return ServerResponse.createByErrorMsg("转出账户不存在", request);
+ }
+ if (deposit == null) {
+ return ServerResponse.createByErrorMsg("转入账户不存在", request);
+ }
+
+ // 检查转出账户余额是否足够
+ if (isBalanceSufficient(disbursement.getAvailableBalance(), transferAmount)) {
+ return ServerResponse.createByErrorMsg("转出账户余额不足", request);
+ }
+
+ // 执行转账操作
+ try {
+ synchronized (userId){
+ performTransfer(disbursement, deposit, transferAmount);
+ }
+ return ServerResponse.createBySuccess("划转成功", request);
+ } catch (Exception e) {
+ log.error("划转失败: " + e.getMessage(), e);
+ return ServerResponse.createByErrorMsg("划转失败", request);
+ }
+ }
+
+ // 参数校验
+ private ServerResponse checkParameters(Integer userId, String disbursementAccount, String depositAccount, String amt, HttpServletRequest request) {
+ if (userId == null || disbursementAccount == null || depositAccount == null || amt == null) {
+ return ServerResponse.createByErrorMsg("输入参数不能为空", request);
+ }
+ return null;
+ }
+
+ // 转账金额校验
+ private BigDecimal validateTransferAmount(String amt, HttpServletRequest request) {
+ try {
+ BigDecimal transferAmount = BigDecimal.valueOf(Double.valueOf(amt));
+ if (transferAmount.compareTo(BigDecimal.ZERO) <= 0) {
+ ServerResponse.createByErrorMsg("转账金额必须大于零", request);
+ return null;
+ }
+ return transferAmount;
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ // 获取账户资产信息
+ private UserAssets getUserAssets(Integer userId, String accountType) {
+ return userAssetsMapper.selectOne(new LambdaQueryWrapper<>(UserAssets.class)
+ .eq(UserAssets::getAccectType, accountType)
+ .eq(UserAssets::getUserId, userId));
+ }
+
+ // 判断余额是否足够
+ private boolean isBalanceSufficient(BigDecimal balance, BigDecimal transferAmount) {
+ return balance.compareTo(transferAmount) < 0;
+ }
+
+ // 执行转账操作
+ private void performTransfer(UserAssets disbursement, UserAssets deposit, BigDecimal transferAmount) {
+ // 更新转出账户余额
+ disbursement.setAvailableBalance(disbursement.getAvailableBalance().subtract(transferAmount));
+ userAssetsMapper.updateById(disbursement);
+
+ // 更新转入账户余额
+ deposit.setAvailableBalance(deposit.getAvailableBalance().add(transferAmount));
+ userAssetsMapper.updateById(deposit);
}
//只要涉及到cumulativeProfitAndLoss变动重新设置状态
@@ -273,4 +378,49 @@
}
extracted(userAssets);
}
+
+ @Override
+ public boolean saveBatch(Collection<UserAssets> entityList, int batchSize) {
+ return false;
+ }
+
+ @Override
+ public boolean saveOrUpdateBatch(Collection<UserAssets> entityList, int batchSize) {
+ return false;
+ }
+
+ @Override
+ public boolean updateBatchById(Collection<UserAssets> entityList, int batchSize) {
+ return false;
+ }
+
+ @Override
+ public boolean saveOrUpdate(UserAssets entity) {
+ return false;
+ }
+
+ @Override
+ public UserAssets getOne(Wrapper<UserAssets> queryWrapper, boolean throwEx) {
+ return null;
+ }
+
+ @Override
+ public Map<String, Object> getMap(Wrapper<UserAssets> queryWrapper) {
+ return null;
+ }
+
+ @Override
+ public <V> V getObj(Wrapper<UserAssets> queryWrapper, Function<? super Object, V> mapper) {
+ return null;
+ }
+
+ @Override
+ public BaseMapper<UserAssets> getBaseMapper() {
+ return null;
+ }
+
+ @Override
+ public Class<UserAssets> getEntityClass() {
+ return null;
+ }
}
--
Gitblit v1.9.3