admin
2019-09-09 0922bfdb56bc30125d6fc8e13c50cdda7cd9dc72
提现自动绑定修改
3个文件已修改
85 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/vo/money/UserMoneyStatisticVO.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
@@ -37,6 +37,7 @@
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
import com.yeshi.fanli.vo.money.UserMoneyStatisticVO;
@@ -303,23 +304,41 @@
            }
        });
        // 获取提现中的信息
        BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
        if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
            vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2));
        // 获取是否绑定了微信
        if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
            vo.setBindingWX(true);
        } else
            vo.setBindingWX(false);
        if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())) {
            // 获取提现中的信息
            BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
            if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
                vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2));
            // 获取是否绑定了微信
            if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {
                vo.setBindingWX(true);
            } else
                vo.setBindingWX(false);
        UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
        if (extra != null && extra.getAutoExtract() != null && extra.getAutoExtract() == true)
            vo.setAutoExtract(true);
        else
            vo.setAutoExtract(false);
            UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
            // 如果绑定了微信而且未开通自动提现就先开通自动提现
            if (extra.getAutoExtract() == null && !StringUtil.isNullOrEmpty(user.getWxUnionId())) {
                UserInfoExtra update = new UserInfoExtra();
                update.setId(extra.getId());
                update.setAutoExtract(true);
                try {
                    userInfoExtraService.saveUserInfoExtra(update);// 设置自动提现开启
                    extra.setAutoExtract(true);
                } catch (UserInfoExtraException e) {
                    e.printStackTrace();
                }
            }
        vo.setAutoExtractHelpUrl(configService.get("auto_extract_help_url"));
            if (extra != null && extra.getAutoExtract() != null && extra.getAutoExtract() == true)
                vo.setAutoExtract(true);
            else
                vo.setAutoExtract(false);
            vo.setAutoExtractHelpUrl(configService.get("auto_extract_help_url"));
            vo.setOpenAutoExtractMsg("自动提现必须要微信授权,当账户中的余额≥2元时,系统在保障你资金安全的情况下,以微信红包的形式完成提现");
            vo.setCloseAutoExtractMsg("关闭自动提现后,60天以内将不自动提现,60天后系统将会自动开启,敬请知晓");
        }
        out.print(JsonUtil.loadTrueResult(builder.create().toJson(vo)));
    }
fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java
@@ -51,6 +51,15 @@
            return false;
    }
    public static boolean greaterThan_2_0(String platform, String versionCode) {
        if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 48))
                || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 66)))
            return true;
        else
            return false;
    }
    public static boolean smallerThan_1_5_1(String platform, String versionCode) {
        if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) < 36))
fanli/src/main/java/com/yeshi/fanli/vo/money/UserMoneyStatisticVO.java
@@ -14,11 +14,28 @@
    private BigDecimal totalInviteMoney;// 累计邀请奖金
    private BigDecimal monthUnRecievedMoney;// 本月未到账
    private BigDecimal totalUnRecievedMoney; // 全部未到账
    private String extractingMoneyInfo;//提现中的资金信息
    private boolean bindingWX;//是否绑定了微信
    private boolean autoExtract;//是否自动提现
    private String autoExtractHelpUrl;//自动提现帮助链接
    private String extractingMoneyInfo;// 提现中的资金信息
    private boolean bindingWX;// 是否绑定了微信
    private boolean autoExtract;// 是否自动提现
    private String autoExtractHelpUrl;// 自动提现帮助链接
    private String closeAutoExtractMsg;// 关闭自动提现提示语
    private String openAutoExtractMsg;// 开启自动提现提示语
    public String getCloseAutoExtractMsg() {
        return closeAutoExtractMsg;
    }
    public void setCloseAutoExtractMsg(String closeAutoExtractMsg) {
        this.closeAutoExtractMsg = closeAutoExtractMsg;
    }
    public String getOpenAutoExtractMsg() {
        return openAutoExtractMsg;
    }
    public void setOpenAutoExtractMsg(String openAutoExtractMsg) {
        this.openAutoExtractMsg = openAutoExtractMsg;
    }
    public String getAutoExtractHelpUrl() {
        return autoExtractHelpUrl;