From 4d2d47577b5d6f27288bfcfc60b74435d464dde0 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 29 Sep 2024 17:33:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 69 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 9eb87e6..cea8031 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -344,7 +344,7 @@
return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
}
if(userPosition.getPositionType() == 3){
- StockDz stockDz = stockDzMapper.selectOne(new LambdaQueryWrapper<StockDz>().eq(StockDz::getStockCode, userPosition.getStockCode()));
+ StockDz stockDz = stockDzMapper.selectOne(new LambdaQueryWrapper<StockDz>().eq(StockDz::getId, userPosition.getDzId()));
LocalDateTime buyOrderLocalDateTime = LocalDateTime.ofInstant(userPosition.getBuyOrderTime().toInstant(), ZoneId.systemDefault());
// 计算天数差
long daysBetween = ChronoUnit.DAYS.between(buyOrderLocalDateTime, LocalDateTime.now());
@@ -683,11 +683,17 @@
end_time = DateTimeUtil.searchStrToTimestamp(endTime);
}
+
+
+
+ List<Integer> ids = new ArrayList<>();
+ if(null != searchId){
+ ids = getSubordinates(searchId);
+ ids.add(searchId);
+ }
PageHelper.startPage(pageNum, pageSize);
-
-
List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state,
- userId, searchId, positionSn, begin_time, end_time,null);
+ userId, ids, positionSn, begin_time, end_time,null);
List<AgentPositionVO> agentPositionVOS = Lists.newArrayList();
for (UserPosition position : userPositions) {
@@ -716,8 +722,14 @@
}
+ List<Integer> ids = new ArrayList<>();
+ if(null != agentId){
+ ids = getSubordinates(agentId);
+ ids.add(agentId);
+ }
+
List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, Integer.valueOf(1),
- null, agentId, null, begin_time, end_time,null);
+ null, ids, null, begin_time, end_time,null);
BigDecimal order_fee_amt = new BigDecimal("0");
@@ -749,15 +761,38 @@
if (StringUtils.isNotBlank(endTime)) {
end_time = DateTimeUtil.searchStrToTimestamp(endTime);
}
- List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, userId, agentId, positionSn, begin_time, end_time,phone);
+ List<Integer> ids = new ArrayList<>();
+ if(null != agentId){
+ ids = getSubordinates(agentId);
+ ids.add(agentId);
+ }
+
+
+ List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, userId, ids, positionSn, begin_time, end_time,phone);
List<AdminPositionVO> adminPositionVOS = Lists.newArrayList();
for (UserPosition position : userPositions) {
AdminPositionVO adminPositionVO = assembleAdminPositionVO(position);
+ AgentUser agentUser = agentUserMapper.selectById(adminPositionVO.getAgentId());
+ adminPositionVO.setAgentName(agentUser.getAgentName());
+ User user = userMapper.selectById(adminPositionVO.getUserId());
+ adminPositionVO.setPhone(user.getPhone());
adminPositionVOS.add(adminPositionVO);
}
PageInfo pageInfo = new PageInfo(userPositions);
pageInfo.setList(adminPositionVOS);
return ServerResponse.createBySuccess(pageInfo);
+ }
+
+ public List<Integer> getSubordinates(Integer id) {
+ List<AgentUser> agentUsers = agentUserMapper.selectList(new LambdaQueryWrapper<AgentUser>());
+ List<Integer> subordinates = new ArrayList<>();
+ for (AgentUser user : agentUsers) {
+ if (id.equals(user.getParentId())) {
+ subordinates.add(user.getId());
+ subordinates.addAll(getSubordinates(user.getId()));
+ }
+ }
+ return subordinates;
}
public int CountPositionNum(Integer state, Integer accountType) {
@@ -1099,7 +1134,14 @@
private AgentPositionVO assembleAgentPositionVO(UserPosition position) {
AgentPositionVO agentPositionVO = new AgentPositionVO();
-
+ User user = userMapper.selectById(position.getUserId());
+ if(null != user){
+ AgentUser agentUser = agentUserMapper.selectById(user.getAgentId());
+ agentPositionVO.setPhone(user.getPhone());
+ if(null != agentUser){
+ agentPositionVO.setAgentName(agentUser.getAgentName());
+ }
+ }
agentPositionVO.setId(position.getId());
agentPositionVO.setPositionSn(position.getPositionSn());
agentPositionVO.setPositionType(position.getPositionType());
@@ -1213,7 +1255,7 @@
userPosition.setBuyOrderPrice(userStockSubscribe.getBuyPrice());
userPosition.setOrderDirection("买涨");
- userPosition.setOrderNum(userStockSubscribe.getApplyNumber());
+ userPosition.setOrderNum(userStockSubscribe.getApplyNumber()*stockSubscribe.getLever().intValue());
userPosition.setIsLock(Integer.valueOf(0));
@@ -1262,8 +1304,8 @@
if(null == userAssets){
return ServerResponse.createByErrorMsg("新股转持仓失败");
}
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userPosition.getOrderTotalPrice()));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney()!=null?userAssets.getFreezeMoney().setScale(2,BigDecimal.ROUND_UP):null);
+// userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userPosition.getOrderTotalPrice()));
+// userAssets.setFreezeMoney(userAssets.getFreezeMoney()!=null?userAssets.getFreezeMoney().setScale(2,BigDecimal.ROUND_UP):null);
userAssetsMapper.updateById(userAssets);
if (ret > 0) {
userStockSubscribe.setStatus(5);
@@ -1595,7 +1637,7 @@
//判断审核开关
if(stockDz.getSwitchType() == 1){
- UserPosition userPosition = getUserPosition(num, user, stockDz, nowPrice, stock, buyAmt);
+ UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
UserPositionCheckDz userPositionCheckDz = Convert.convert(UserPositionCheckDz.class, userPosition);
userPositionCheckDz.setDzId(dzId);
userPositionCheckDzService.save(userPositionCheckDz);
@@ -1603,13 +1645,13 @@
}
// 创建UserPosition对象
- UserPosition userPosition = getUserPosition(num, user, stockDz, nowPrice, stock, buyAmt);
+ UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
userPositionMapper.insert(userPosition);
userAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
return ServerResponse.createBySuccess("购买成功", request);
}
- private UserPosition getUserPosition(Integer num, User user, StockDz stockDz, BigDecimal nowPrice, Stock stock, BigDecimal buyAmt) {
+ private UserPosition getUserPosition(Integer dzId,Integer num, User user, StockDz stockDz, BigDecimal nowPrice, Stock stock, BigDecimal buyAmt) {
UserPosition userPosition = new UserPosition();
userPosition.setPositionType(3);
userPosition.setPositionSn(KeyUtils.getUniqueKey());
@@ -1639,6 +1681,7 @@
userPosition.setOrderStayDays(Integer.valueOf(0));
userPosition.setOrderStayFee(new BigDecimal("0"));
userPosition.setOrderSpread(BigDecimal.ZERO);
+ userPosition.setDzId(dzId);
return userPosition;
}
--
Gitblit v1.9.3