Merge remote-tracking branch 'origin/6-29' into 6-29

zj

2025-06-27 ea772fcdef390ca8bdb6746a1504e5ca88037d00

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

@@ -82,7 +82,12 @@
                                         HttpServletRequest request) {
        return this.iSiteAdminService.listByAdmin(adminName, adminPhone, request, pageNum, pageSize);
    }

    //查询首页充值，提现，注册统计
    @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({"queryApplyLever.do"})
    @ResponseBody
@@ -244,13 +249,15 @@
                                   @RequestParam("edesc") String desc,
                                   @RequestParam("isOpen") String isOpen,
                                   @RequestParam("returnTime") String returnTime,
                                   @RequestParam("title") String title){
                                   @RequestParam("title") String title,
                                   @RequestParam("buyLowestNum") Integer buyLowestNum){
        EChoBean eChoBean = new EChoBean();
        eChoBean.setEdesc(desc);
        eChoBean.setIsOpen(isOpen);
        eChoBean.setReturnTime(returnTime);
        eChoBean.setTitle(title);
        eChoBean.setReturnOfRate(returnOfRate);
        eChoBean.setBuyLowestNum(buyLowestNum);
        if(iEchoServices.insertEcho(eChoBean) >= 1){
            return ServerResponse.createBySuccess();
        }else{
@@ -269,8 +276,9 @@
                                      @RequestParam("isOpen") String isOpen,
                                      @RequestParam("returnTime") String returnTime,
                                      @RequestParam("title") String title,
                                      @RequestParam("id") Integer id
                                     ){
                                      @RequestParam("id") Integer id,
                                      @RequestParam("buyLowestNum") Integer buyLowestNum
    ){
        EChoBean eChoBean = new EChoBean();
        eChoBean.setId(id);
        eChoBean.setEdesc(desc);
@@ -278,6 +286,7 @@
        eChoBean.setReturnTime(returnTime);
        eChoBean.setTitle(title);
        eChoBean.setReturnOfRate(returnOfRate);
        eChoBean.setBuyLowestNum(buyLowestNum);
        if(iEchoServices.updateEcho(eChoBean) >= 1){
            return ServerResponse.createBySuccess();
        }else{