From ad35d23bdd072d7179eb4bfcb588975f37a68f53 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 07 May 2025 00:32:57 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/protol/UserController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 8fcee31..50f1ea1 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -79,6 +79,9 @@
@Autowired
UserPositionMapper userPositionMapper;
+ @Autowired
+ TransactionLogService transactionLogService;
+
private static final ThreadLocal<Boolean> orderCreated = ThreadLocal.withInitial(() -> false);
private final Lock lock = new ReentrantLock();
@@ -291,7 +294,7 @@
userPendingorderService.updateById(userPendingorder);
iUserAssetsServices.availablebalanceChange(userPendingorder.getStockGid().equals("ST") ? userPendingorder.getStockGid() : "USD",
userPendingorder.getUserId(),
- EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT,
+ EUserAssets.THE_DEPOSIT_WILL_BE_RETURNED_IF_THE_ORDER_IS_CANCELLED,
userPendingorder.getOrderTotalPrice(), "", "");
return ServerResponse.createBySuccess("撤销挂单成功",request);
}
@@ -513,5 +516,10 @@
return iApplyLeverServices.applyLever(applyLever,request);
}
-
+ @RequestMapping({"flowLog.do"})
+ @ResponseBody
+ public ServerResponse flowLog(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "100") int pageSize,HttpServletRequest request) {
+ return transactionLogService.flowLog(pageNum,pageSize,request);
+ }
}
--
Gitblit v1.9.3