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

zj

2024-06-04 935b27a40c549f3ebc15e7e9654cdfd01e8eab13

 src/main/java/com/nq/controller/agent/AgentController.java

@@ -31,6 +31,8 @@
    @Autowired
    IAgentAgencyFeeService iAgentAgencyFeeService;

    @Autowired
    ISiteUserOptionLogService iSiteUserOptionLogService;

    @Autowired
    ISiteAdminService iSiteAdminService;
@@ -42,6 +44,12 @@
        return this.iAgentUserService.getAgentInfo(request);
    }

    @RequestMapping("optionList.do")
    @ResponseBody
    public ServerResponse optionList(@RequestParam(value = "agentId", required = false) Integer agentId,@RequestParam(value = "userId", required = false) Integer userId, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize){
        return this.iSiteUserOptionLogService.list(agentId,userId,pageNum,pageSize);
    }

    //修改代理用户密码
    @RequestMapping({"updatePwd.do"})
    @ResponseBody
@@ -49,6 +57,19 @@
        return this.iAgentUserService.updatePwd(oldPwd, newPwd, request);
    }

    //查询首页充值，提现，注册统计
    @RequestMapping({"moneyCount.do"})
    @ResponseBody
    public ServerResponse moneyCount(@RequestParam(value = "agentId", required = false) String agentId,@RequestParam(value = "startTime", required = false) String startTime,@RequestParam(value = "entTime", required = false) String entTime) {
        return this.iSiteAdminService.moneyCount(agentId,startTime,entTime);
    }

    //查询代理总资金
    @RequestMapping({"totalAgencyFunds.do"})
    @ResponseBody
    public ServerResponse totalAgencyFunds(@RequestParam(value = "agentId", required = false) String agentId) {
        return this.iSiteAdminService.totalAgencyFunds(agentId);
    }

    //查询首页 资金情况、持仓情况、盈亏信息、提现情况、股票信息、代理信息
    @RequestMapping({"count.do"})