From 331800c37d20f0fb12513a8a4143b36c2e2764cb Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 02 Aug 2025 15:11:29 +0800
Subject: [PATCH] pc接口调整
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index dacba97..027f2a9 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -311,19 +311,21 @@
}
}
}
- //退回资金 交易记录MEX
- MoneyLog moneyLog = new MoneyLog();
- EUserAssets eUserAssets = EUserAssets.BUY_RT;
- moneyLog.setDescs(eUserAssets.getDesc());
- moneyLog.setBeFore(before);
- moneyLog.setAfter(userAssets.getAvailableBalance().toString());
- moneyLog.setAmount(refundPrice.toString());
- moneyLog.setAccectType(EStockType.MX.getCode());
- moneyLog.setType(eUserAssets.getCode());
- moneyLog.setUserId(userAssets.getUserId()+"");
- moneyLog.setSymbol(EStockType.MX.getSymbol());
- moneyLog.setCreateTime(new Date());
- moneyLogMapper.insert(moneyLog);
+ //如果退回资金 add交易记录MEX
+ if (refundPrice.compareTo(BigDecimal.ZERO) > 0) {
+ MoneyLog moneyLog = new MoneyLog();
+ EUserAssets eUserAssets = EUserAssets.BUY_RT;
+ moneyLog.setDescs(eUserAssets.getDesc());
+ moneyLog.setBeFore(before);
+ moneyLog.setAfter(userAssets.getAvailableBalance().toString());
+ moneyLog.setAmount(refundPrice.toString());
+ moneyLog.setAccectType(EStockType.MX.getCode());
+ moneyLog.setType(eUserAssets.getCode());
+ moneyLog.setUserId(userAssets.getUserId()+"");
+ moneyLog.setSymbol(EStockType.MX.getSymbol());
+ moneyLog.setCreateTime(new Date());
+ moneyLogMapper.insert(moneyLog);
+ }
ret = userStockSubscribeMapper.update1(model);
userAssetsMapper.updateById(userAssets);
iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
@@ -497,26 +499,26 @@
String header = request.getHeader(property);
if (header != null) {
User user = iUserService.getCurrentRefreshUser(request);
-
List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
- /*if (type==null||type.equals("")){
- userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).orderByDesc("add_time"));
- }else{
- userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).eq("type", type).orderByDesc("add_time"));
- }*/
-
- List<UserStockSubscribeVo> list = new ArrayList<>();
- for (UserStockSubscribeVo userStockSubscribe1 : userStockSubscribe) {
- StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
- .eq("newlist_id", userStockSubscribe1.getNewStockId()));
- if (stockSubscribe != null) {
- list.add(userStockSubscribe1);
- }
- }
- return ServerResponse.createBySuccess(list);
+ return ServerResponse.createBySuccess(userStockSubscribe);
}
return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
}
+
+ @Override
+ public ServerResponse getOneSubscribeByUserIdPage(int pageNum,int pageSize,String type, Integer status, HttpServletRequest request) {
+ String property = PropertiesUtil.getProperty("user.cookie.name");
+ String header = request.getHeader(property);
+ if (header != null) {
+ User user = iUserService.getCurrentRefreshUser(request);
+ PageHelper.startPage(pageNum, pageSize);
+ List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
+ PageInfo<UserStockSubscribeVo> pageInfo = new PageInfo<>(userStockSubscribe);
+ return ServerResponse.createBySuccess(pageInfo);
+ }
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+ }
+
/**
* 新股申购-用户提交金额
*/
--
Gitblit v1.9.3