From 4d2d47577b5d6f27288bfcfc60b74435d464dde0 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 29 Sep 2024 17:33:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 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 9506c9e..b22d648 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -4,11 +4,16 @@
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.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.service.IUserAssetsServices;
+import com.nq.utils.KeyUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,6 +40,12 @@
@Autowired
UserWithdrawServiceImpl withdrawService;
+
+ @Resource
+ UserRechargeMapper userRechargeMapper;
+
+ @Resource
+ UserMapper userMapper;
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
@@ -69,16 +80,26 @@
BigDecimal availableBalance = bigAmt.subtract(userAssets.getAmountToBeCovered());
if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
}else{
BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(bigAmt);
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(bigAmt));
userAssets.setAmountToBeCovered(amountToBeCovered);
}
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
}
+ }else{
+ if(userAssets.getAvailableBalance().compareTo(BigDecimal.ZERO) <= 0){
+ return ServerResponse.createByErrorMsg("客户账户余额为0");
+ }else if(userAssets.getAvailableBalance().subtract(bigAmt.abs()).compareTo(BigDecimal.ZERO) < 0){
+ return ServerResponse.createByErrorMsg("客户账户余额不足扣款");
+ }
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
}
if( userAssetsMapper.updateById(userAssets)>0){
+// saveUserRecharge(userAssets.getUserId(),bigAmt);
return ServerResponse.createBySuccess();
}else{
return ServerResponse.createByErrorMsg("修改金额失败");
@@ -87,11 +108,31 @@
if(type.equals("2")){
return userRechargeService.createOrder(userAssets.getUserId(),1,bigAmt.intValue(),"1");
}else{
-
-
return ServerResponse.createBySuccess();
}
}
+ }
+
+ public void saveUserRecharge(Integer userId ,BigDecimal amt){
+ User user = this.userMapper.selectById(userId);
+ if (user == null) {
+ return;
+ }
+ UserRecharge userRecharge = new UserRecharge();
+ userRecharge.setUserId(user.getId());
+ userRecharge.setNickName(user.getRealName());
+ userRecharge.setAgentId(user.getAgentId());
+
+ String ordersn = KeyUtils.getRechargeOrderSn();
+ userRecharge.setOrderSn(ordersn);
+
+ userRecharge.setPayChannel("1");
+ userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
+ userRecharge.setOrderStatus(Integer.valueOf(1));
+ userRecharge.setPayId(1);
+ userRechargeMapper.insert(userRecharge);
}
@@ -149,9 +190,11 @@
BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
}else{
BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(amount);
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
userAssets.setAmountToBeCovered(amountToBeCovered);
}
}else{
--
Gitblit v1.9.3