ffe399c530b491f9f8be0eb9016a1b548322ebcc..e7a5bfcd5348464e7c24c4024f9d1c61723a5ea4
2026-01-14 zj
Merge remote-tracking branch 'origin/1.10-Fidelitys多股' into 1.10-Fidelitys多股
e7a5bf diff | tree
2026-01-14 zj
1
afb9b1 diff | tree
6 files modified
27 ■■■■■ changed files
src/main/java/com/nq/service/IUserRechargeService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/nq/service/IUserService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/nq/service/IUserWithdrawService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/nq/service/impl/UserServiceImpl.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/nq/service/IUserRechargeService.java
@@ -41,4 +41,6 @@
  BigDecimal CountTotalRechargeAmountByTime(Integer paramInteger);
  List<UserRecharge> exportByAdmin( Integer agentId, Integer userId, String realName, Integer state, String beginTime, String endTime, HttpServletRequest request);
  int countPendingRecharge();
}
src/main/java/com/nq/service/IUserService.java
@@ -92,4 +92,6 @@
  ServerResponse queryMyOption(String code, HttpServletRequest request);
  ServerResponse getMoenyLog(String type,HttpServletRequest request);
  int countPendingAuth();
}
src/main/java/com/nq/service/IUserWithdrawService.java
@@ -35,4 +35,6 @@
  ServerResponse deleteWithdraw(Integer withdrawId);
  List<UserWithdraw> exportByAdmin( Integer agentId, Integer userId, String realName, Integer state, String beginTime, String endTime, HttpServletRequest request);
  int countPendingWithdraw();
}
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -404,4 +404,11 @@
        return userRecharges;
    }
    @Override
    public int countPendingRecharge() {
        com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<UserRecharge> queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<>();
        queryWrapper.eq("order_status", 0);
        return this.userRechargeMapper.selectCount(queryWrapper).intValue();
    }
}
src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -1203,5 +1203,12 @@
        return  ServerResponse.createBySuccess(mapper.selectList(queryWrapper));
    }
    @Override
    public int countPendingAuth() {
        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("is_active", 1);
        return this.userMapper.selectCount(queryWrapper).intValue();
    }
}
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -413,5 +413,12 @@
    }
    @Override
    public int countPendingWithdraw() {
        com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<UserWithdraw> queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<>();
        queryWrapper.eq("with_status", 0);
        return this.userWithdrawMapper.selectCount(queryWrapper).intValue();
    }
}