admin
2020-04-28 061e912ff3cec51f8f8dcb4e6336bcd2fc03c164
Merge remote-tracking branch 'origin/div' into div
2个文件已修改
30 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -717,6 +717,23 @@
        // 人工客服链接
        json.put("csdLink", configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
        
        UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);
        String leftTime = "";
        if (userVIPInfo != null && userVIPInfo.getState() == UserVIPInfo.STATE_VERIFING &&  userVIPInfo.getApplyTime() != null) {
            long s = 48 * 60 * 60 - ((System.currentTimeMillis() - userVIPInfo.getApplyTime().getTime()) / 1000);
            if (s > 3600) {
                leftTime = s / 3600 + "小时";
                leftTime = "还剩" + leftTime;
            } else if (s >= 60) {
                leftTime = s / 60 + "分钟";
                leftTime = "还剩" + leftTime;
            } else if (s > 0) {
                leftTime = s + "秒";
                leftTime = "还剩" + leftTime;
            }
        }
        json.put("leftTime", leftTime);
        if (!StringUtil.isNullOrEmpty(callback)) {
            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));
        } else {
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
@@ -70,7 +70,9 @@
    // 上上级关系状态
    @Transient
    private Boolean stateSuper;
    @Transient
    private Integer validState;
    public Long getId() {
        return id;
@@ -152,5 +154,12 @@
        this.stateSuper = stateSuper;
    }
    public Integer getValidState() {
        return validState;
    }
    public void setValidState(Integer validState) {
        this.validState = validState;
    }
}