diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index 5ad1056e..6c585a1d 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -806,7 +806,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme entity.setOrderNumber(outOrderNo); } // 执行提现操作 - BaseResp baseResp = wuyouPay.extractOrderForAudit(isHistoryData, entity.getOrderNumber(), entity.getUserId(), isUser, entity.getMoney(), entity.getZhifubao(), entity.getZhifubaoName(), entity.getBankName()); + BaseResp baseResp = wuyouPay.extractOrderExt(isHistoryData, true, entity.getOrderNumber(), entity.getUserId(), isUser, entity.getMoney(), entity.getZhifubao(), entity.getZhifubaoName(), entity.getBankName()); if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) { entity.setState(1); } else if (StringUtils.isNotBlank(baseResp.getErrorMsg())) { diff --git a/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java b/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java index a9dca063..ccde6ce8 100644 --- a/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java +++ b/src/main/java/com/sqx/modules/pay/wuyou/WuyouPay.java @@ -125,48 +125,47 @@ public class WuyouPay { /** * 提现 * - * @param account 支付宝账号 / 银行卡号 - * @param userName 支付宝名称 / 用户名 - * @param bankName 开户行,支付宝提现可以不用传 + * @param outOrderNo 提现订单号 + * @param userId + * @param isUser 是否普通用户 普通用户-true,代理用户-false + * @param amount 提现金额 + * @param account 收款账户,支付宝账号 / 银行卡号 + * @param userName 真实姓名 / 用户名 + * @param bankName 开户行,支付宝提现可以不用传 */ public BaseResp extractOrder(String outOrderNo, Long userId, boolean isUser, String amount, String account, String userName, String bankName) { - String payConfig = commonInfoService.findOne(927).getValue(); - if (!"1".equals(payConfig)) { - BaseResp baseResp = new BaseResp(); - baseResp.setErrorMsg("暂无提现渠道"); - return baseResp; - } - Map params = getBaseParams(); - - params.put("out_trade_no", String.format("%s-%s:%s", outOrderNo, userId, isUser ? "us" : "dl")); - params.put("total", amount); - params.put("bank_card", account); - params.put("bank_account_name", userName); - params.put("bank_name", isUser ? bankName : "1"); - params.put("bank_branch", "1"); - params.put("province", "1"); - params.put("city", "1"); - params.put("notify_url", extractNotifyUrl); - - String sign = Encrypt.getParamsSign(params); - params.put("sign", sign); - - params.put("business_type", 0); - params.put("business_attr", isUser ? "unionpay" : "alipay"); - - String body = request(Constants.EXTRACT_URL, params, ""); - return JSONObject.parseObject(body, BaseResp.class); + return extractOrderExt(false, false, outOrderNo, userId, isUser, amount, account, userName, bankName); } /** - * 提现,人工审核使用,不收配置开关限制,直接提现 + * 提现,人工审核使用,不受配置开关限制,直接提现 * * @param account 支付宝账号 * @param userName 支付宝名称 */ - public BaseResp extractOrderForAudit(boolean isHistoryData, String outOrderNo, Long userId, boolean isUser, String amount, String account, - String userName, String bankName) { + /** + * @param isHistoryData cash_out是否历史提现数据 + * @param ignoreConfig 是否忽略配置开关,true忽略 + * @param outOrderNo 提现订单号 + * @param userId + * @param isUser 是否普通用户 普通用户-true,代理用户-false + * @param amount 提现金额 + * @param account 收款账户,支付宝账号 / 银行卡号 + * @param userName 真实姓名 / 用户名 + * @param bankName 开户行,支付宝提现可以不用传 + * @return + */ + public BaseResp extractOrderExt(boolean isHistoryData, boolean ignoreConfig, String outOrderNo, Long userId, boolean isUser, String amount, String account, + String userName, String bankName) { + if (!ignoreConfig) { + String payConfig = commonInfoService.findOne(927).getValue(); + if (!"1".equals(payConfig)) { + BaseResp baseResp = new BaseResp(); + baseResp.setErrorMsg("暂无提现渠道"); + return baseResp; + } + } Map params = getBaseParams(); params.put("out_trade_no", String.format("%s-%s:%s", outOrderNo, userId, isUser ? "us" : "dl")); @@ -187,8 +186,11 @@ public class WuyouPay { params.put("sign", sign); params.put("business_type", 0); - params.put("business_attr", isUser ? "unionpay" : "alipay"); - + if (isHistoryData) { + params.put("business_attr", "alipay"); + } else { + params.put("business_attr", isUser ? "unionpay" : "alipay"); + } String body = request(Constants.EXTRACT_URL, params, ""); return JSONObject.parseObject(body, BaseResp.class); }