From 7c6c9e822f33ac120036af42fcf33b5b0e443351 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 18 Jul 2024 15:40:22 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 4 +-
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java | 1
src/main/java/com/nq/service/impl/UserAssetsServices.java | 34 +++++++++++++++++
src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java | 8 +++-
src/main/java/com/nq/controller/AgentApiController.java | 31 +++++++++++++++
src/main/java/com/nq/service/IUserStockSubscribeService.java | 2
src/main/java/com/nq/dao/UserStockSubscribeMapper.java | 2
src/main/java/com/nq/controller/UserPositionCheckDzController.java | 7 +++
src/main/resources/mapper/UserStockSubscribeMapper.xml | 3 +
src/main/java/com/nq/service/impl/UserServiceImpl.java | 4 +-
10 files changed, 87 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/controller/AgentApiController.java b/src/main/java/com/nq/controller/AgentApiController.java
index 53f182b..e262b1f 100644
--- a/src/main/java/com/nq/controller/AgentApiController.java
+++ b/src/main/java/com/nq/controller/AgentApiController.java
@@ -3,8 +3,10 @@
import com.nq.common.ServerResponse;
+import com.nq.pojo.UserStockSubscribe;
import com.nq.service.IAgentUserService;
+import com.nq.service.IUserStockSubscribeService;
import com.nq.utils.PropertiesUtil;
import com.nq.utils.redis.CookieUtils;
@@ -46,6 +48,9 @@
@Autowired
IAgentUserService iAgentUserService;
+ @Autowired
+ IUserStockSubscribeService iUserStockSubscribeService;
+
//代理后台登录
@RequestMapping({"login.do"})
@ResponseBody
@@ -74,4 +79,30 @@
CookieUtils.delLoginToken(httpServletRequest, httpServletResponse, cookie_name);
return ServerResponse.createBySuccess();
}
+
+ //申购信息列表查询
+ @RequestMapping({"getStockSubscribeList.do"})
+ @ResponseBody
+ public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
+ @RequestParam(value = "keyword", defaultValue = "") String keyword,
+ @RequestParam(value = "agentId", required = false) String agentId,
+ HttpServletRequest request) {
+ return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId, request);
+ }
+
+ //申购信息-添加 修改
+ @RequestMapping({"saveStockSubscribe.do"})
+ @ResponseBody
+ public ServerResponse saveStockSubscribe(UserStockSubscribe model, HttpServletRequest request) {
+ return this.iUserStockSubscribeService.save(model, request);
+ }
+
+ //新股申购-删除
+ @RequestMapping({"delStockSubscribe.do"})
+ @ResponseBody
+ public ServerResponse delStockSubscribe(@RequestParam("id") int id, HttpServletRequest request) {
+ return this.iUserStockSubscribeService.del(id, request);
+ }
+
}
diff --git a/src/main/java/com/nq/controller/UserPositionCheckDzController.java b/src/main/java/com/nq/controller/UserPositionCheckDzController.java
index 01e84cc..68ef99e 100644
--- a/src/main/java/com/nq/controller/UserPositionCheckDzController.java
+++ b/src/main/java/com/nq/controller/UserPositionCheckDzController.java
@@ -59,7 +59,8 @@
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>();
@@ -68,6 +69,10 @@
queryWrapper.eq(UserPositionCheckDz::getCheckType, type);
}
+ if (agentId != null) {
+ queryWrapper.eq(UserPositionCheckDz::getAgentId, agentId);
+ }
+
// 判断stockCode是否为空，不为空则加入查询条件
if (stockCode != null) {
queryWrapper.eq(UserPositionCheckDz::getStockCode, stockCode);
diff --git a/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java b/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
index bfc9700..038e4da 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java
@@ -89,8 +89,12 @@
//申购信息列表查询
@RequestMapping({"getStockSubscribeList.do"})
@ResponseBody
- public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "12") int pageSize, @RequestParam(value = "keyword", defaultValue = "") String keyword, HttpServletRequest request) {
- return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword, request);
+ public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
+ @RequestParam(value = "keyword", defaultValue = "") String keyword,
+ @RequestParam(value = "agentId", required = false) String agentId,
+ HttpServletRequest request) {
+ return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId, request);
}
diff --git a/src/main/java/com/nq/dao/UserStockSubscribeMapper.java b/src/main/java/com/nq/dao/UserStockSubscribeMapper.java
index a7b7cc0..6ce292c 100644
--- a/src/main/java/com/nq/dao/UserStockSubscribeMapper.java
+++ b/src/main/java/com/nq/dao/UserStockSubscribeMapper.java
@@ -51,7 +51,7 @@
* @author lr
* @date 2020/09/11
**/
- List<UserStockSubscribe> pageList(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("keyword") String keyword);
+ List<UserStockSubscribe> pageList(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("keyword") String keyword,@Param("agentId") String agentId);
/**
* [查询] 分页查询 count
diff --git a/src/main/java/com/nq/service/IUserStockSubscribeService.java b/src/main/java/com/nq/service/IUserStockSubscribeService.java
index a0b8b88..4360a88 100644
--- a/src/main/java/com/nq/service/IUserStockSubscribeService.java
+++ b/src/main/java/com/nq/service/IUserStockSubscribeService.java
@@ -38,7 +38,7 @@
/**
* 新股申购-列表查询
*/
- ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, HttpServletRequest request);
+ ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword,String agentId, HttpServletRequest request);
/**
* 新股申购-查询详情
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 7ab3733..738477d 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -4,11 +4,16 @@
import com.nq.common.ServerResponse;
import com.nq.dao.MoneyLogMapper;
import com.nq.dao.UserAssetsMapper;
+import com.nq.dao.UserMapper;
+import com.nq.dao.UserRechargeMapper;
import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pojo.MoneyLog;
+import com.nq.pojo.User;
import com.nq.pojo.UserAssets;
+import com.nq.pojo.UserRecharge;
import com.nq.service.IUserAssetsServices;
+import com.nq.utils.KeyUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,6 +40,12 @@
@Autowired
UserWithdrawServiceImpl withdrawService;
+
+ @Resource
+ UserRechargeMapper userRechargeMapper;
+
+ @Resource
+ UserMapper userMapper;
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
@@ -86,6 +97,7 @@
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
}
if( userAssetsMapper.updateById(userAssets)>0){
+ saveUserRecharge(userAssets.getUserId(),bigAmt);
return ServerResponse.createBySuccess();
}else{
return ServerResponse.createByErrorMsg("修改金额失败");
@@ -101,6 +113,28 @@
}
}
+ public void saveUserRecharge(Integer userId ,BigDecimal amt){
+ User user = this.userMapper.selectById(userId);
+ if (user == null) {
+ return;
+ }
+ UserRecharge userRecharge = new UserRecharge();
+ userRecharge.setUserId(user.getId());
+ userRecharge.setNickName(user.getRealName());
+ userRecharge.setAgentId(user.getAgentId());
+
+ String ordersn = KeyUtils.getRechargeOrderSn();
+ userRecharge.setOrderSn(ordersn);
+
+ userRecharge.setPayChannel("1");
+ userRecharge.setPayAmt(new BigDecimal(amt.intValue()));
+ userRecharge.setAddTime(new Date());
+ userRecharge.setPayTime(new Date());
+ userRecharge.setOrderStatus(Integer.valueOf(1));
+ userRecharge.setPayId(1);
+ userRechargeMapper.insert(userRecharge);
+ }
+
@Override
public List<UserAssets> assetsByUserId(Integer userId) {
diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index cbe4889..80dbc40 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -279,6 +279,7 @@
User user = userMapper.selectById(u.getUserId());
if(user != null){
u.setUserPhone(user.getPhone());
+ u.setNickName(user.getRealName());
}
}
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 2bd9c4c..f9ba983 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -837,8 +837,8 @@
userOuts.add(userOut);
}
- PageInfo pageInfo = new PageInfo(userOuts);
-
+ PageInfo pageInfo = new PageInfo(users);
+ pageInfo.setList(userOuts);
return ServerResponse.createBySuccess(pageInfo);
}
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 538a1b0..b2b068b 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -377,9 +377,9 @@
/*新股申购-查询列表*/
@Override
- public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, HttpServletRequest request){
+ public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
PageHelper.startPage(pageNum, pageSize);
- List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword);
+ List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
PageInfo pageInfo = new PageInfo(listData);
pageInfo.setList(listData);
return ServerResponse.createBySuccess(pageInfo);
diff --git a/src/main/resources/mapper/UserStockSubscribeMapper.xml b/src/main/resources/mapper/UserStockSubscribeMapper.xml
index dbad41a..edf5e0e 100644
--- a/src/main/resources/mapper/UserStockSubscribeMapper.xml
+++ b/src/main/resources/mapper/UserStockSubscribeMapper.xml
@@ -213,6 +213,9 @@
<if test="keyword != null and keyword != ''">
and (user_id = #{keyword} or real_name like CONCAT('%',#{keyword},'%') or phone like CONCAT('%',#{keyword},'%'))
</if>
+ <if test="agentId != null and agentId != ''">
+ and agent_id = #{agentId}
+ </if>
order by id desc
</select>
--
Gitblit v1.9.3