forked from angelo/java-retail-app
Compare commits
No commits in common. "52f927fb91f9b767f61c9dcc0e888a2be9440ced" and "3d82634a2035a2507f36d112c7c62808543f9968" have entirely different histories.
52f927fb91
...
3d82634a20
|
|
@ -112,11 +112,11 @@ public class ApiCuMemberWithdrawController extends BaseController {
|
||||||
return AjaxResult.error("会员不存在,请核对后再操作!");
|
return AjaxResult.error("会员不存在,请核对后再操作!");
|
||||||
}
|
}
|
||||||
//获取银行卡信息
|
//获取银行卡信息
|
||||||
// Long pkBank = cuMemberWithdrawParam.getPkBank();
|
Long pkBank = cuMemberWithdrawParam.getPkBank();
|
||||||
// CuMemberBankVO memberBank = iCuMemberBankService.selectCuMemberBankById(pkBank);
|
CuMemberBankVO memberBank = iCuMemberBankService.selectCuMemberBankById(pkBank);
|
||||||
// if (null == memberBank) {
|
if (null == memberBank) {
|
||||||
// return AjaxResult.error("请绑定银行卡");
|
return AjaxResult.error("请绑定银行卡");
|
||||||
// }
|
}
|
||||||
//校验支付密码
|
//校验支付密码
|
||||||
String payPwd = cuMemberLoginExt.getPayPwd();
|
String payPwd = cuMemberLoginExt.getPayPwd();
|
||||||
if (StringUtils.isEmpty(payPwd) || !SecurityUtils.matchesPassword(cuMemberWithdrawParam.getPayPwd(), payPwd)) {
|
if (StringUtils.isEmpty(payPwd) || !SecurityUtils.matchesPassword(cuMemberWithdrawParam.getPayPwd(), payPwd)) {
|
||||||
|
|
@ -220,7 +220,7 @@ public class ApiCuMemberWithdrawController extends BaseController {
|
||||||
CuMemberWithdraw cuMemberWithdraw = CuMemberWithdraw.builder()
|
CuMemberWithdraw cuMemberWithdraw = CuMemberWithdraw.builder()
|
||||||
.pkMember(pkMember)
|
.pkMember(pkMember)
|
||||||
.pkAccount(pkAccount)
|
.pkAccount(pkAccount)
|
||||||
// .pkBank(pkBank)
|
.pkBank(pkBank)
|
||||||
.remarks(cuMemberWithdrawParam.getRemarks())
|
.remarks(cuMemberWithdrawParam.getRemarks())
|
||||||
.pkRate(currencyDTO.getPkId())
|
.pkRate(currencyDTO.getPkId())
|
||||||
.cashAmount(cashAmount)
|
.cashAmount(cashAmount)
|
||||||
|
|
|
||||||
|
|
@ -72,13 +72,11 @@ public class JdPayAggregateCreateOrderRequest implements Serializable {
|
||||||
* 同步通知页面url
|
* 同步通知页面url
|
||||||
*/
|
*/
|
||||||
private String pageBackUrl;
|
private String pageBackUrl;
|
||||||
private String pagebackUrl;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 点击完成按钮后跳转页面
|
* 点击完成按钮后跳转页面
|
||||||
*/
|
*/
|
||||||
private String callbackUrl;
|
private String callbackUrl;
|
||||||
private String callBackUrl;
|
|
||||||
/**
|
/**
|
||||||
* 风控信息map-- json串
|
* 风控信息map-- json串
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -103,13 +103,8 @@ public class JdPayServiceImpl implements IJdPayService {
|
||||||
// 用户标识(收银台必传)
|
// 用户标识(收银台必传)
|
||||||
.userId(userId)
|
.userId(userId)
|
||||||
// 同步通知URL(收银台必传,页面回调地址)
|
// 同步通知URL(收银台必传,页面回调地址)
|
||||||
|
|
||||||
.pagebackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
|
|
||||||
.pageBackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
|
.pageBackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
|
||||||
|
|
||||||
.callbackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
|
.callbackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
|
||||||
.callBackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam())
|
|
||||||
|
|
||||||
// 支付回调地址
|
// 支付回调地址
|
||||||
.notifyUrl(jdPayBankProperties.getNotifyUrl())
|
.notifyUrl(jdPayBankProperties.getNotifyUrl())
|
||||||
// 交易类型
|
// 交易类型
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue