From 4046f94a57f0c10e9509a49ad0d37d701aeb8186 Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Tue, 02 Apr 2024 23:47:51 +0800
Subject: [PATCH] 修复自选bug 和 增加流水日志
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 7610fd6..33c7ce1 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -1,8 +1,11 @@
package com.nq.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.nq.common.ServerResponse;
+import com.nq.dao.MoneyLogMapper;
import com.nq.dao.UserAssetsMapper;
import com.nq.enums.EUserAssets;
+import com.nq.pojo.MoneyLog;
import com.nq.pojo.UserAssets;
import com.nq.service.IUserAssetsServices;
import org.springframework.stereotype.Service;
@@ -12,15 +15,23 @@
import java.util.List;
import java.util.Objects;
+/**
+ * 用户资产
+ */
@Service
public class UserAssetsServices implements IUserAssetsServices {
@Resource
UserAssetsMapper userAssetsMapper;
+ @Resource
+ MoneyLogMapper moneyLogMapper;
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
+ if(accetType.equals("SZHB")){
+ accetType = "US";
+ }
QueryWrapper<UserAssets> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("accect_type",accetType);
queryWrapper.eq("user_id",userId);
@@ -35,6 +46,24 @@
return userAssets;
}
+ @Override
+ public ServerResponse updateUserAssets(Integer id, String amt) {
+ UserAssets userAssets = userAssetsMapper.selectById(id);
+
+ BigDecimal bigAmt = new BigDecimal(amt);
+ if(amt.contains("-")){
+ if(userAssets.getAvailableBalance().compareTo(bigAmt.negate())<0){
+ return ServerResponse.createByErrorMsg("账户余额不足");
+ }
+ }
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
+ if( userAssetsMapper.updateById(userAssets)>0){
+ return ServerResponse.createBySuccess();
+ }else{
+ return ServerResponse.createByErrorMsg("修改金额失败");
+ }
+
+ }
@Override
@@ -46,6 +75,9 @@
@Override
public BigDecimal getAvailableBalance(String accetType, Integer userId) {
+ if(accetType.equals("SZHB")){
+ accetType = "US";
+ }
return assetsByTypeAndUserId(accetType,userId).getAvailableBalance();
}
@@ -53,8 +85,14 @@
@Override
public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) {
-
+ if(accetType.equals("SZHB")){
+ accetType = "US";
+ }
UserAssets userAssets = assetsByTypeAndUserId(accetType,userId);
+
+ String type = eUserAssets.getDesc();
+ String before = userAssets.getAvailableBalance().setScale(2).toString();
+ String accectType = userAssets.getAccectType();
if(Objects.equals(eUserAssets.getCode(), EUserAssets.BUY.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
@@ -65,7 +103,7 @@
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CALCULATE_PROFIT_AND_LOSS.getCode())){
- userAssets.setProfitAndLoss(userAssets.getProfitAndLoss().add(amount));
+ userAssets.setCumulativeProfitAndLoss(userAssets.getProfitAndLoss().add(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TRANSFER.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TOP_UP.getCode())){
@@ -73,6 +111,16 @@
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.WITHDRAW.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
}
+ String after = userAssets.getAvailableBalance().toString();
+ MoneyLog moneyLog = new MoneyLog();
+ moneyLog.setDescs(eUserAssets.getDesc());
+ moneyLog.setBeFore(before);
+ moneyLog.setAfter(after);
+ moneyLog.setAmount(amount.toString());
+ moneyLog.setAccectType(accectType);
+ moneyLog.setType(type);
+ moneyLog.setUserId(userId+"");
+ moneyLogMapper.insert(moneyLog);
return userAssetsMapper.updateById(userAssets)>1;
}
}
--
Gitblit v1.9.3