1

zj

2025-05-08 4130970dd61791e0a5cb0771a9b707084f1ed464

 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 = "page", defaultValue = "1") int page,
                                  @RequestParam(value = "pageSize", defaultValue = "100") int pageSize,HttpServletRequest request) {
        return transactionLogService.flowLog(page,pageSize,request);
    }
}