admin
2019-09-09 5672b9c605571080645a20ad6b2a81053d7528cd
自动提现接口
4个文件已修改
81 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgOrderDetailMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/vo/money/UserMoneyStatisticVO.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
@@ -28,6 +28,8 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
@@ -64,6 +66,9 @@
    @Resource
    private UserInfoExtraService userInfoExtraService;
    @Resource
    private ConfigService configService;
    /**
     * 新版资金详情(1.4.9)
@@ -299,7 +304,6 @@
        });
        // 获取提现中的信息
        BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);
        if (extractingMoney.compareTo(new BigDecimal(0)) > 0)
            vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2));
@@ -315,7 +319,70 @@
        else
            vo.setAutoExtract(false);
        vo.setAutoExtractHelpUrl(configService.get("auto_extract_help_url"));
        out.print(JsonUtil.loadTrueResult(builder.create().toJson(vo)));
    }
    /**
     * 自动提现
     *
     * @param acceptData
     * @param type
     * @param out
     */
    @RequestMapping("autoExtract")
    public void autoExtract(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {
        if (type == null) {
            out.print(JsonUtil.loadFalseResult("请上传type"));
            return;
        }
        if (uid == null) {
            out.print(JsonUtil.loadFalseResult("用戶未登录"));
            return;
        }
        UserInfoExtra userExtra = userInfoExtraService.getUserInfoExtra(uid);
        UserInfo user = userInfoService.selectByPKey(uid);
        if (user == null) {
            out.print(JsonUtil.loadFalseResult("用戶不存在"));
            return;
        }
        if (type == 1)// 开启
        {
            if (userExtra.getAutoExtract() == null || userExtra.getAutoExtract() == false) {
                if (StringUtil.isNullOrEmpty(user.getWxUnionId()))// 尚未綁定微信
                {
                    out.print(JsonUtil.loadFalseResult("未綁定微信"));
                    return;
                }
                // 设置自动提现
                UserInfoExtra update = new UserInfoExtra();
                update.setId(userExtra.getId());
                update.setAutoExtract(true);
                try {
                    userInfoExtraService.saveUserInfoExtra(update);
                } catch (UserInfoExtraException e) {
                    e.printStackTrace();
                }
                out.print(JsonUtil.loadTrueResult(""));
                return;
            } else {
                out.print(JsonUtil.loadTrueResult(""));
                return;
            }
        } else {// 关闭
            UserInfoExtra update = new UserInfoExtra();
            update.setId(userExtra.getId());
            update.setAutoExtract(false);
            try {
                userInfoExtraService.saveUserInfoExtra(update);
            } catch (UserInfoExtraException e) {
                e.printStackTrace();
            }
            out.print(JsonUtil.loadTrueResult(""));
            return;
        }
    }
}
fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
@@ -18,7 +18,6 @@
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.log.TLJLogHelper;
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgOrderDetailMapper.xml
@@ -37,7 +37,7 @@
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_msg_order where mo_uid = #{uid,jdbcType=BIGINT} and
        mo_order_id=#{orderId}
        mo_order_id=#{orderId}  order by mo_id desc limit 1
    </select>
    <select id="listByOrderId" resultMap="BaseResultMap"
        parameterType="java.lang.String">
fanli/src/main/java/com/yeshi/fanli/vo/money/UserMoneyStatisticVO.java
@@ -17,8 +17,17 @@
    private String extractingMoneyInfo;//提现中的资金信息
    private boolean bindingWX;//是否绑定了微信
    private boolean autoExtract;//是否自动提现
    private String autoExtractHelpUrl;//自动提现帮助链接
    
    public String getAutoExtractHelpUrl() {
        return autoExtractHelpUrl;
    }
    public void setAutoExtractHelpUrl(String autoExtractHelpUrl) {
        this.autoExtractHelpUrl = autoExtractHelpUrl;
    }
    public String getExtractingMoneyInfo() {
        return extractingMoneyInfo;
    }