From 4130970dd61791e0a5cb0771a9b707084f1ed464 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 08 May 2025 00:39:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/UserPositionCheckDzController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/controller/UserPositionCheckDzController.java b/src/main/java/com/nq/controller/UserPositionCheckDzController.java
index 01e84cc..0bf3c43 100644
--- a/src/main/java/com/nq/controller/UserPositionCheckDzController.java
+++ b/src/main/java/com/nq/controller/UserPositionCheckDzController.java
@@ -59,13 +59,18 @@
public ServerResponse getList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "type", required = false) Integer type,
- @RequestParam(value = "stockCode", required = false) String stockCode) {
+ @RequestParam(value = "stockCode", required = false)String stockCode,
+ @RequestParam(value = "agentId", required = false) String agentId) {
Page<UserPositionCheckDz> page = Page.of(pageNum, pageSize);
LambdaQueryWrapper<UserPositionCheckDz> queryWrapper = new LambdaQueryWrapper<UserPositionCheckDz>();
// 判断type是否为空，不为空则加入查询条件
if (type != null) {
queryWrapper.eq(UserPositionCheckDz::getCheckType, type);
+ }
+
+ if (agentId != null) {
+ queryWrapper.eq(UserPositionCheckDz::getAgentId, agentId);
}
// 判断stockCode是否为空，不为空则加入查询条件
@@ -96,13 +101,13 @@
if(checkType == 2){
userPositionCheckDz.setCheckType(checkType);
service.updateById(userPositionCheckDz);
- return ServerResponse.createBySuccess("审核成功");
+ return ServerResponse.createBySuccessMsg("审核成功");
}
User user = userMapper.selectById(userPositionCheckDz.getUserId());
StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("id", userPositionCheckDz.getDzId()));
- UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+ UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(EStockType.ST.getCode(), user.getId());
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
return ServerResponse.createByErrorMsg("用户账户有待补资金未补齐，审核失败");
}
@@ -125,8 +130,9 @@
UserPosition userPosition = Convert.convert(UserPosition.class, userPositionCheckDz);
userPosition.setBuyOrderPrice(nowPrice);
userPosition.setId(null);
+ userPosition.setDzId(stockDz.getId());
userPositionMapper.insert(userPosition);
- userAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
+ userAssetsServices.availablebalanceChange(EStockType.ST.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
return ServerResponse.createBySuccessMsg("审核成功,订单已转客户持仓");
}
}
--
Gitblit v1.9.3