From 993755aece09ef32798c04cfdaf4921cd5572743 Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Sat, 08 Nov 2025 00:33:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/FileUploadServiceImpl.java | 1 +
src/main/java/com/nq/controller/protol/UserController.java | 4 +++-
src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java | 6 ++++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index f91a9a4..c8826be 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -162,7 +162,9 @@
@RequestMapping({"sell.do"})
@ResponseBody
public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn,@RequestParam("number") Integer number) {
- return this.iUserPositionService.sell(positionSn,1,number,request);
+ synchronized (positionSn) {
+ return this.iUserPositionService.sell(positionSn, 1, number, request);
+ }
}
diff --git a/src/main/java/com/nq/service/impl/FileUploadServiceImpl.java b/src/main/java/com/nq/service/impl/FileUploadServiceImpl.java
index 0744da1..d500308 100644
--- a/src/main/java/com/nq/service/impl/FileUploadServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/FileUploadServiceImpl.java
@@ -28,6 +28,7 @@
public ServerResponse upload(MultipartFile file, String path) {
+ path = PropertiesUtil.getProperty("ftp.address");
// 参数校验
if (file == null || file.isEmpty()) {
return ServerResponse.createByErrorMsg("文件不能为空");
diff --git a/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java b/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
index d186c53..9175cc3 100644
--- a/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
@@ -335,12 +335,13 @@
UserAssets userAssets = userAssetsMapper.selectOne(queryWrapper);
String before = userAssets.getAvailableBalance().toString();
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userPendingorder.getBuyAmt()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userPendingorder.getBuyAmt()));
userAssetsMapper.updateById(userAssets);
MoneyLog moneyLog = new MoneyLog();
moneyLog.setDescs(EUserAssets.BUY_REFUND.getDesc());
moneyLog.setBeFore(before);
moneyLog.setAfter(userAssets.getAvailableBalance().toString());
- moneyLog.setAmount(userAssets.getAvailableBalance().toString());
+ moneyLog.setAmount(userPendingorder.getBuyAmt().toString());
moneyLog.setAccectType("US");
moneyLog.setType(EUserAssets.BUY_REFUND.getCode());
moneyLog.setUserId(userPendingorder.getUserId()+"");
@@ -369,12 +370,13 @@
UserAssets userAssets = userAssetsMapper.selectOne(queryWrapper);
String before = userAssets.getAvailableBalance().toString();
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userPendingorder.getBuyAmt()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userPendingorder.getBuyAmt()));
userAssetsMapper.updateById(userAssets);
MoneyLog moneyLog = new MoneyLog();
moneyLog.setDescs(EUserAssets.BUY_REFUND.getDesc());
moneyLog.setBeFore(before);
moneyLog.setAfter(userAssets.getAvailableBalance().toString());
- moneyLog.setAmount(userAssets.getAvailableBalance().toString());
+ moneyLog.setAmount(userPendingorder.getBuyAmt().toString());
moneyLog.setAccectType("US");
moneyLog.setType(EUserAssets.BUY_REFUND.getCode());
moneyLog.setUserId(userPendingorder.getUserId()+"");
--
Gitblit v1.9.3