From 846ff7c7570ef124b10e48d6816955a1bbc02db5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 23 May 2024 01:33:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into zyqs-0502
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 96 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 86 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 5e1a4e9..66ab3f1 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -4,15 +4,19 @@
import com.nq.common.ServerResponse;
import com.nq.dao.MoneyLogMapper;
import com.nq.dao.UserAssetsMapper;
+import com.nq.dao.UserOptionLogMapper;
import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pojo.MoneyLog;
import com.nq.pojo.UserAssets;
+import com.nq.pojo.UserOptionLog;
import com.nq.service.IUserAssetsServices;
+import org.joda.time.DateTime;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -24,6 +28,9 @@
@Resource
UserAssetsMapper userAssetsMapper;
+
+ @Resource
+ UserOptionLogMapper userOptionLogMapper;
@Resource
MoneyLogMapper moneyLogMapper;
@@ -58,7 +65,14 @@
}
}
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
- if( userAssetsMapper.updateById(userAssets)>0){
+ if(userAssetsMapper.updateById(userAssets)>0){
+ userOptionLogMapper.insert(UserOptionLog.builder()
+ .userId(userAssets.getUserId())
+ .money(bigAmt)
+ .userAccectId(userAssets.getId())
+ .createTime(new Date())
+ .type(amt.contains("-")?0:1)
+ .build());
return ServerResponse.createBySuccess();
}else{
return ServerResponse.createByErrorMsg("修改金额失败");
@@ -91,28 +105,59 @@
String type = eUserAssets.getDesc();
String before = userAssets.getAvailableBalance().toString();
String accectType = userAssets.getAccectType();
- if(Objects.equals(eUserAssets.getCode(), EUserAssets.BUY.getCode())){
+ if(Objects.equals(eUserAssets.getCode(), EUserAssets.BUY.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CLOSE_POSITION.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
- userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount.abs()));
+ extracted(amount, userAssets);
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT.getCode())){
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
+ if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
+ userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ }else{
+ BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(amount);
+ userAssets.setAmountToBeCovered(amountToBeCovered);
+ }
+ }else{
+ 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.setCumulativeProfitAndLoss(userAssets.getProfitAndLoss().add(amount.abs()));
+ extracted(amount, userAssets);
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TRANSFER.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
- eUserAssets.setDesc(desc);
+ eUserAssets.setDesc(desc);
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TOP_UP.getCode())){
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
+ if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
+ userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ }else{
+ BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(amount);
+ userAssets.setAmountToBeCovered(amountToBeCovered);
+ }
+ }else{
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ }
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.WITHDRAW.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.HANDLING_CHARGE.getCode())){
- userAssets.setHandlingCharge(userAssets.getHandlingCharge().add(amount.abs()));
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
- }
+ 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));
+ if(userAssets.getIsZf() == 0){
+ userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().subtract(amount));
+ }else{
+ userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
+ }
+ extracted(userAssets);
+ }
String after = userAssets.getAvailableBalance().toString();
MoneyLog moneyLog = new MoneyLog();
moneyLog.setDescs(eUserAssets.getDesc());
@@ -123,7 +168,38 @@
moneyLog.setType(eUserAssets.getCode());
moneyLog.setUserId(userId+"");
moneyLog.setSymbol(EStockType.getEStockTypeByCode(accetType).getSymbol());
+ moneyLog.setCreateTime(new Date());
moneyLogMapper.insert(moneyLog);
return userAssetsMapper.updateById(userAssets)>1;
}
+
+ //只要涉及到cumulativeProfitAndLoss变动重新设置状态
+ private static void extracted(UserAssets userAssets) {
+ if(userAssets.getCumulativeProfitAndLoss().compareTo(BigDecimal.ZERO) >= 0){
+ userAssets.setIsZf(0);
+ }else{
+ userAssets.setIsZf(1);
+ userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().abs());
+ }
+ }
+
+ private static void extracted(BigDecimal amount, UserAssets userAssets) {
+ if(userAssets.getIsZf() == 1){
+ userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().negate());
+ }
+ if(userAssets.getIsZf() == 0){
+ if(amount.compareTo(BigDecimal.ZERO) >= 0){
+ userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount.abs()));
+ }else{
+ userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().subtract(amount.abs()));
+ }
+ }else{
+ if(amount.compareTo(BigDecimal.ZERO) >= 0){
+ userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount.abs()));
+ }else{
+ userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().subtract(amount.abs()));
+ }
+ }
+ extracted(userAssets);
+ }
}
--
Gitblit v1.9.3