Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy

zj

2024-07-15 2ed572d6b2a4be6b91b3e2a1ed48485abde91553

 src/main/java/com/nq/controller/backend/AdminUserController.java

@@ -4,6 +4,7 @@
import com.nq.common.ServerResponse;
import com.nq.pojo.User;
import com.nq.pojo.UserBank;
import com.nq.service.IApplyLeverServices;
import com.nq.service.IUserBankService;
import com.nq.service.IUserService;
import javax.servlet.http.HttpServletRequest;
@@ -27,11 +28,19 @@
    @Autowired
    IUserBankService iUserBankService;


    //分页查询所有用户列表信息 及模糊查询用户信息
    @RequestMapping({"list.do"})
    @ResponseBody
    public ServerResponse list(@RequestParam(value = "realName", required = false) String realName, @RequestParam(value = "phone", required = false) String phone, @RequestParam(value = "agentId", required = false) Integer agentId, @RequestParam(value = "accountType", required = false) Integer accountType, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize, HttpServletRequest request) {
        return this.iUserService.listByAdmin(realName, phone, agentId, accountType, pageNum, pageSize, request);
    public ServerResponse list(@RequestParam(value = "realName", required = false) String realName,
                               @RequestParam(value = "phone", required = false) String phone,
                               @RequestParam(value = "agentId", required = false) Integer agentId,
                               @RequestParam(value = "accountType", required = false) Integer accountType,
                               @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                               @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
                               @RequestParam(value = "id", required = false) String id,
                               HttpServletRequest request) {
        return this.iUserService.listByAdmin(realName, phone, agentId, accountType, pageNum, pageSize,id, request);
    }

    //查询用户信息是否存在
@@ -72,8 +81,8 @@
    //添加用户列表 用户信息
    @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, accountType, request);
    }

    @RequestMapping({"authByAdmin.do"})
@@ -95,4 +104,6 @@
    public ServerResponse delete(Integer userId, HttpServletRequest request) {
        return this.iUserService.delete(userId, request);
    }


}