1
zj
2026-03-10 6cdaf4889c27cad69071d49dfa494434ff27d826
1
4 files modified
24 ■■■■■ changed files
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java 11 ●●●● patch | view | raw | blame | history
trading-order-admin/src/main/java/com/yami/trading/admin/model/UpdateUserModel.java 6 ●●●●● patch | view | raw | blame | history
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java 1 ●●●● patch | view | raw | blame | history
trading-order-bean/src/main/java/com/yami/trading/bean/model/User.java 6 ●●●●● patch | view | raw | blame | history
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java
@@ -99,6 +99,7 @@
        boolean isRealNameAuthority = user.isRealNameAuthority();
        String oldRemarks = user.getRemarks();
        int oldUserLevel = user.getUserLevel() / 10;
        Integer oldCreditScore = user.getCreditScore() != null ? user.getCreditScore() : 100;
        user.setEnabled(model.isEnabled());
        user.setRemarks(model.getRemarks());
        user.setWithdrawAuthority(model.isWithdrawAuthority());
@@ -110,9 +111,13 @@
        if (model.getUserLevel() >= 0) {
            user.setUserLevel(model.getUserLevel() * 10 + user.getUserLevel() % 10);
        }
        if (model.getCreditScore() != null) {
            user.setCreditScore(model.getCreditScore());
        }
        userService.updateById(user);
        Integer newCreditScore = user.getCreditScore() != null ? user.getCreditScore() : 100;
        String logtxt = MessageFormat.format(
                "ip:" + IPHelper.getIpAddr() + ",管理员手动修改了用户信息,用户名:{0},原登录权限:{1},原是否业务锁定:{2},原提现权限:{3},原基础认证:{4},原备注:{5},原信用分:{6},现登录权限:{7},现是否业务锁定:{8},现提现权限:{9},现基础认证:{10},现备注:{11},现信用分:{12}",
                "ip:" + IPHelper.getIpAddr() + ",管理员手动修改了用户信息,用户名:{0},原登录权限:{1},原是否业务锁定:{2},原提现权限:{3},原基础认证:{4},原备注:{5},原用户等级:{6},原信用分:{7},现登录权限:{8},现是否业务锁定:{9},现提现权限:{10},现基础认证:{11},现备注:{12},现用户等级:{13},现信用分:{14}",
                user.getUserName(),
                isLoginAuthority,
@@ -121,13 +126,15 @@
                isRealNameAuthority,
                oldRemarks,
                oldUserLevel,
                oldCreditScore,
                user.isLoginAuthority(),
                user.isEnabled(),
                user.isWithdrawAuthority(),
                user.isRealNameAuthority(),
                user.getRemarks(),
                user.getUserLevel() / 10);
                user.getUserLevel() / 10,
                newCreditScore);
        Log log = new Log();
        log.setCategory(Constants.LOG_CATEGORY_OPERATION);
        log.setUsername(user.getUserName());
trading-order-admin/src/main/java/com/yami/trading/admin/model/UpdateUserModel.java
@@ -31,4 +31,10 @@
    @ApiModelProperty("实名认证")
    private Boolean realNameAuthority;
    /**
     * 信用分
     */
    @ApiModelProperty("信用分")
    private Integer creditScore;
}
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
@@ -575,6 +575,7 @@
        // 如:级别11表示:新注册的前端显示为VIP1;
        map.put("user_level", (int) (party.getUserLevel() % 10));
        map.put("user_level_custom", (int) Math.floor(party.getUserLevel() / 10));
        map.put("credit_score", party.getCreditScore() != null ? party.getCreditScore() : 100);
        map.put("username", party.getUserName());
        map.put("userrole", party.getRoleName());
        map.put("usercode", party.getUserCode());
trading-order-bean/src/main/java/com/yami/trading/bean/model/User.java
@@ -198,6 +198,12 @@
    @ApiModelProperty("账户类型 0主账户 1模拟账户")
    private Integer accountType = 0;
    /**
     * 信用分,默认100
     */
    @ApiModelProperty("信用分")
    private Integer creditScore = 100;
    public BigDecimal getWithdrawLimitAmount() {
        return withdrawLimitAmount == null ? new BigDecimal(0) : withdrawLimitAmount;
    }