Merge branch 'dev' into test
This commit is contained in:
commit
88a4bc1171
|
|
@ -125,10 +125,12 @@ public class WuyouPay {
|
|||
/**
|
||||
* 提现
|
||||
*
|
||||
* @param account 支付宝账号
|
||||
* @param userName 支付宝名称
|
||||
* @param account 支付宝账号 / 银行卡号
|
||||
* @param userName 支付宝名称 / 用户名
|
||||
* @param bankName 开户行,支付宝提现可以不用传
|
||||
*/
|
||||
public BaseResp extractOrder(String outOrderNo, Long userId, boolean isUser, String amount, String account, String userName) {
|
||||
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();
|
||||
|
|
@ -141,7 +143,7 @@ public class WuyouPay {
|
|||
params.put("total", amount);
|
||||
params.put("bank_card", account);
|
||||
params.put("bank_account_name", userName);
|
||||
params.put("bank_name", "1");
|
||||
params.put("bank_name", isUser ? bankName : "1");
|
||||
params.put("bank_branch", "1");
|
||||
params.put("province", "1");
|
||||
params.put("city", "1");
|
||||
|
|
@ -151,7 +153,7 @@ public class WuyouPay {
|
|||
params.put("sign", sign);
|
||||
|
||||
params.put("business_type", 0);
|
||||
params.put("business_attr", "alipay");
|
||||
params.put("business_attr", isUser ? "unionpay" : "alipay");
|
||||
|
||||
String body = request(Constants.EXTRACT_URL, params, "");
|
||||
return JSONObject.parseObject(body, BaseResp.class);
|
||||
|
|
@ -232,12 +234,28 @@ public class WuyouPay {
|
|||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
// payOrder("20221118123456794", "0.1", "Mozilla/5.0", "1230-98688", "h5");
|
||||
// queryOrder("20221118123456791", "0.1", "Mozilla/5.0");
|
||||
WuyouPay pay = new WuyouPay(null, null);
|
||||
|
||||
// extractOrder("20221118123456793", "1", "1157756119@qq.com", "巩奕杰");
|
||||
// queryExtractOrder("20221118123456793", "1");
|
||||
Map<String, Object> params = pay.getBaseParams();
|
||||
|
||||
System.out.println(DateUtil.today() + " 00:00:00");
|
||||
params.put("out_trade_no", String.format("%s-%s:%s", "1111122223333", "26924", "us"));
|
||||
params.put("total", "0.1");
|
||||
params.put("bank_card", "6214831259609102");
|
||||
params.put("bank_account_name", "巩奕杰");
|
||||
params.put("bank_name", "招商银行");
|
||||
params.put("bank_branch", "1");
|
||||
params.put("province", "1");
|
||||
params.put("city", "1");
|
||||
params.put("notify_url", "https://test.baidu.com");
|
||||
|
||||
String sign = Encrypt.getParamsSign(params);
|
||||
params.put("sign", sign);
|
||||
|
||||
params.put("business_type", 0);
|
||||
params.put("business_attr", "unionpay");
|
||||
|
||||
String body = pay.request(Constants.EXTRACT_URL, params, "");
|
||||
BaseResp resp = JSONObject.parseObject(body, BaseResp.class);
|
||||
System.out.println(resp);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue