From bd21cffed808eff59e330de7142c59af6b48e169 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 01 Oct 2024 19:17:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index b22d648..db2dc98 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -1,17 +1,13 @@
package com.nq.service.impl;
+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.nq.common.ServerResponse;
-import com.nq.dao.MoneyLogMapper;
-import com.nq.dao.UserAssetsMapper;
-import com.nq.dao.UserMapper;
-import com.nq.dao.UserRechargeMapper;
+import com.nq.dao.*;
import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
-import com.nq.pojo.MoneyLog;
-import com.nq.pojo.User;
-import com.nq.pojo.UserAssets;
-import com.nq.pojo.UserRecharge;
+import com.nq.pojo.*;
import com.nq.service.IUserAssetsServices;
import com.nq.utils.KeyUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +43,9 @@
@Resource
UserMapper userMapper;
+ @Autowired
+ UserPositionMapper userPositionMapper;
+
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
if(accetType.equals("SZHB")){
@@ -69,6 +68,7 @@
@Override
public ServerResponse updateUserAssets(Integer id, String amt,String type) {
UserAssets userAssets = userAssetsMapper.selectById(id);
+ UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
// 0 入款 1是扣钱 2 是充值 3 是提币
BigDecimal bigAmt = new BigDecimal(amt);
if(type.equals("0") || type.equals("1")){
@@ -82,10 +82,16 @@
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ if(null != userPosition){
+ userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered());
+ }
}else{
BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(bigAmt);
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(bigAmt));
userAssets.setAmountToBeCovered(amountToBeCovered);
+ if(null != userPosition){
+ userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered());
+ }
}
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
@@ -97,6 +103,9 @@
return ServerResponse.createByErrorMsg("客户账户余额不足扣款");
}
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
+ }
+ if(null != userPosition){
+ userPositionMapper.updateById(userPosition);
}
if( userAssetsMapper.updateById(userAssets)>0){
// saveUserRecharge(userAssets.getUserId(),bigAmt);
@@ -156,7 +165,7 @@
public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) {
UserAssets userAssets = assetsByTypeAndUserId(accetType,userId);
-
+ UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
String type = eUserAssets.getDesc();
String before = userAssets.getAvailableBalance().toString();
String accectType = userAssets.getAccectType();
@@ -215,6 +224,11 @@
}
extracted(userAssets);
}
+
+ if(null != userPosition){
+ userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered());
+ userPositionMapper.updateById(userPosition);
+ }
String after = userAssets.getAvailableBalance().toString();
MoneyLog moneyLog = new MoneyLog();
moneyLog.setDescs(eUserAssets.getDesc());
--
Gitblit v1.9.3