From 7b419a8d76be83426c8b92505a431069522b5722 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 02 Sep 2024 15:17:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/agent/AgentController.java | 7 +++++--
src/main/java/com/nq/pojo/AgentUser.java | 3 +++
src/main/java/com/nq/service/impl/UserAssetsServices.java | 5 +++--
src/main/java/com/nq/controller/agent/AgentUserController.java | 8 ++++++--
src/main/java/com/nq/controller/backend/AdminUserController.java | 7 +++++--
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nq/controller/agent/AgentController.java b/src/main/java/com/nq/controller/agent/AgentController.java
index c32794e..3dfe0d2 100644
--- a/src/main/java/com/nq/controller/agent/AgentController.java
+++ b/src/main/java/com/nq/controller/agent/AgentController.java
@@ -82,8 +82,11 @@
//添加用户管理 账户信息
@RequestMapping({"addSimulatedAccount.do"})
@ResponseBody
- public ServerResponse addSimulatedAccount(HttpServletRequest request,@RequestParam("agentId") Integer agentId, @RequestParam("phone") String phone, @RequestParam("amt") String amt, @RequestParam("accountType") Integer accountType, @RequestParam("pwd") String pwd) {
- return this.iUserService.addSimulatedAccount(agentId, phone, pwd, amt, accountType, request);
+ public ServerResponse addSimulatedAccount(HttpServletRequest request,@RequestParam("agentId") Integer agentId,
+ @RequestParam("phone") String phone,
+ @RequestParam("accountType") Integer accountType,
+ @RequestParam("pwd") String pwd) {
+ return this.iUserService.addSimulatedAccount(agentId, phone, pwd, "0", accountType, request);
}
//查询股票统计指定时间内，代理客户（已平仓）的交易盈亏
diff --git a/src/main/java/com/nq/controller/agent/AgentUserController.java b/src/main/java/com/nq/controller/agent/AgentUserController.java
index e3f4d95..ebf88f6 100644
--- a/src/main/java/com/nq/controller/agent/AgentUserController.java
+++ b/src/main/java/com/nq/controller/agent/AgentUserController.java
@@ -61,8 +61,12 @@
//添加用户列表 用户信息
@RequestMapping({"addSimulatedAccount.do"})
@ResponseBody
- public ServerResponse addSimulatedAccount(HttpServletRequest request, @RequestParam(value = "agentId", required = false) Integer agentId, @RequestParam("phone") String phone, @RequestParam("amt") String amt, @RequestParam("accountType") Integer accountType, @RequestParam("pwd") String pwd) {
- return this.iUserService.addSimulatedAccount(agentId, phone, pwd, amt, accountType, request);
+ public ServerResponse addSimulatedAccount(HttpServletRequest request,
+ @RequestParam(value = "agentId", required = false) Integer agentId,
+ @RequestParam("phone") String phone,
+ @RequestParam("accountType") Integer accountType,
+ @RequestParam("pwd") String pwd) {
+ return this.iUserService.addSimulatedAccount(agentId, phone, pwd, "0", accountType, request);
}
@RequestMapping({"authByAdmin.do"})
diff --git a/src/main/java/com/nq/controller/backend/AdminUserController.java b/src/main/java/com/nq/controller/backend/AdminUserController.java
index 9e24ecb..0cd7ec7 100644
--- a/src/main/java/com/nq/controller/backend/AdminUserController.java
+++ b/src/main/java/com/nq/controller/backend/AdminUserController.java
@@ -74,8 +74,11 @@
//添加用户列表 用户信息
@RequestMapping({"addSimulatedAccount.do"})
@ResponseBody
- public ServerResponse addSimulatedAccount(HttpServletRequest request, @RequestParam(value = "agentId", required = false) Integer agentId, @RequestParam("phone") String phone, @RequestParam("amt") String amt, @RequestParam("accountType") Integer accountType, @RequestParam("pwd") String pwd) {
- return this.iUserService.addSimulatedAccount(agentId, phone, pwd, amt, accountType, request);
+ public ServerResponse addSimulatedAccount(HttpServletRequest request, @RequestParam(value = "agentId", required = false) Integer agentId,
+ @RequestParam("phone") String phone,
+ @RequestParam("accountType") Integer accountType,
+ @RequestParam("pwd") String pwd) {
+ return this.iUserService.addSimulatedAccount(agentId, phone, pwd, "0", accountType, request);
}
@RequestMapping({"authByAdmin.do"})
diff --git a/src/main/java/com/nq/pojo/AgentUser.java b/src/main/java/com/nq/pojo/AgentUser.java
index ed5367a..c731a3a 100644
--- a/src/main/java/com/nq/pojo/AgentUser.java
+++ b/src/main/java/com/nq/pojo/AgentUser.java
@@ -1,5 +1,7 @@
package com.nq.pojo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.math.BigDecimal;
@@ -8,6 +10,7 @@
@Data
public class AgentUser {
+ @TableId(value = "id",type = IdType.AUTO)
private Integer id;
private String agentName;
private String agentPwd;
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 8c448c4..bc730c5 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -1,5 +1,6 @@
package com.nq.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nq.common.ServerResponse;
import com.nq.dao.MoneyLogMapper;
@@ -62,7 +63,7 @@
@Override
public ServerResponse updateUserAssets(Integer id, String amt,String type) {
- UserAssets userAssets = userAssetsMapper.selectById(id);
+ UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<>(UserAssets.class).eq(UserAssets::getUserId,id));
// 0 入款 1是扣钱 2 是充值 3 是提币
BigDecimal bigAmt = new BigDecimal(amt);
if(type.equals("0") || type.equals("1")){
@@ -104,7 +105,7 @@
}
}else{
if(type.equals("2")){
- return userRechargeService.createOrder(userAssets.getUserId(),1,bigAmt.intValue(),"1");
+ return userRechargeService.createOrder(id,1,bigAmt.intValue(),"1");
}else{
--
Gitblit v1.9.3