Adapay 多商户模式需要指定 merchant_key
This commit is contained in:
HH
parent
acbf0a6e95
commit
b491e7d9d7
|
|
@ -46,7 +46,7 @@ public class CustomerBankController {
|
|||
String memberId = AdapayUtils.getCustomerMemberId(request.getCustomerId(), merchant.getDeptId());
|
||||
// 先在Adapay创建实名用户
|
||||
Map<String, Object> result1 = adapayService.createMember(merchant.getDeptId(), memberId, request.getPhone(),
|
||||
request.getName(), request.getCertId(), null, null, null, null);
|
||||
request.getName(), request.getCertId());
|
||||
if (!AdapayStatusEnum.succeeded.code.equals(result1.get("status"))) {
|
||||
log.warn("实名认证失败[{}]", JSON.toJSONString(result1));
|
||||
return AjaxResult.error("个人信息不正确");
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ public class AdapayService {
|
|||
* @param confirmAmt [必填] String(14) 确认金额，必须大于0，保留两位小数点，如0.10、100.05等。必须小于等于原支付金额-已确认金额-已撤销金额
|
||||
* @return 成功时同步返回一个包含 支付确认对象的JSON https://docs.adapay.tech/api/trade.html#id54
|
||||
*/
|
||||
public Map<String, Object> paymentConfirm(@NotNull String paymentId, @NotNull String orderNo, @NotNull String confirmAmt) throws BaseAdaPayException {
|
||||
return paymentConfirm(paymentId, orderNo, confirmAmt, null, null, null);
|
||||
public Map<String, Object> paymentConfirm(@NotNull Long deptId, @NotNull String paymentId, @NotNull String orderNo, @NotNull String confirmAmt) throws BaseAdaPayException {
|
||||
return paymentConfirm(deptId, paymentId, orderNo, confirmAmt, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -62,7 +62,7 @@ public class AdapayService {
|
|||
* @param divMembers 分账对象信息列表，一次请求最多仅支持7个分账方。json对象 形式，详见 分账对象信息列表
|
||||
* @return 成功时同步返回一个包含 支付确认对象的JSON https://docs.adapay.tech/api/trade.html#id54
|
||||
*/
|
||||
public Map<String, Object> paymentConfirm(@NotNull String paymentId, @NotNull String orderNo, @NotNull String confirmAmt,
|
||||
public Map<String, Object> paymentConfirm(@NotNull Long deptId, @NotNull String paymentId, @NotNull String orderNo, @NotNull String confirmAmt,
|
||||
String description, String feeMode, List<DivMember> divMembers) throws BaseAdaPayException {
|
||||
Map<String, Object> confirmParams = new HashMap<>();
|
||||
confirmParams.put("payment_id", paymentId);
|
||||
|
|
@ -71,7 +71,7 @@ public class AdapayService {
|
|||
confirmParams.put("div_members", divMembers);
|
||||
confirmParams.put("fee_mode", feeMode);
|
||||
confirmParams.put("description", description);
|
||||
return PaymentConfirm.create(confirmParams);
|
||||
return PaymentConfirm.create(confirmParams, deptId.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -109,7 +109,7 @@ public class AdapayService {
|
|||
if (!CollectionUtils.isEmpty(divMembers)) {
|
||||
balanceParam.put("div_members", divMembers);
|
||||
}
|
||||
return AdapayCommon.requestAdapay(balanceParam);
|
||||
return AdapayCommon.requestAdapay(balanceParam, deptId.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -167,7 +167,7 @@ public class AdapayService {
|
|||
// 目前仅支持：bank_account（银行卡）
|
||||
settleCountParams.put("channel", "bank_account");
|
||||
settleCountParams.put("account_info", accountInfo);
|
||||
return SettleAccount.create(settleCountParams);
|
||||
return SettleAccount.create(settleCountParams, deptId.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -178,30 +178,21 @@ public class AdapayService {
|
|||
* @param telNo [必填]用户手机号
|
||||
* @param username [必填]用户姓名
|
||||
* @param certId [必填]证件号
|
||||
* @param location 用户地址
|
||||
* @param email 用户邮箱
|
||||
* @param gender MALE：男，FEMALE：女，为空时表示未填写
|
||||
* @param nickname 用户昵称
|
||||
* @return 成功时同步返回一个包含Member对象的JSON
|
||||
*/
|
||||
public Map<String, Object> createMember(@NotNull Long deptId, @NotNull String memberId, @NotNull String telNo,
|
||||
@NotNull String username, @NotNull String certId, String location,
|
||||
String email, String gender, String nickname) throws BaseAdaPayException {
|
||||
@NotNull String username, @NotNull String certId) throws BaseAdaPayException {
|
||||
// 获取商户的appId
|
||||
String appId = AdapayConfig.getAppId(deptId);
|
||||
Map<String, Object> memberParams = new HashMap<>();
|
||||
memberParams.put("member_id", memberId);
|
||||
memberParams.put("app_id", appId);
|
||||
// memberParams.put("location", location);
|
||||
// memberParams.put("email", email);
|
||||
// memberParams.put("gender", gender);
|
||||
// memberParams.put("nickname", nickname);
|
||||
memberParams.put("tel_no", telNo);
|
||||
memberParams.put("user_name", username);
|
||||
// 证件类型，仅支持：00-身份证
|
||||
memberParams.put("cert_type", "00");
|
||||
// 接口功能号
|
||||
memberParams.put("adapay_func_code", deptId.toString());
|
||||
memberParams.put("adapay_func_code", "members.realname");
|
||||
memberParams.put("cert_id", certId);
|
||||
return AdapayCommon.requestAdapay(memberParams, deptId.toString());
|
||||
}
|
||||
|
|
@ -238,7 +229,7 @@ public class AdapayService {
|
|||
cashParam.put("remark", remark);
|
||||
cashParam.put("fee_mode", feeMode);
|
||||
DrawCashReplyMapping.putCallback(orderNo, callback);
|
||||
return Drawcash.create(cashParam);
|
||||
return Drawcash.create(cashParam, deptId.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -294,7 +285,7 @@ public class AdapayService {
|
|||
paymentParams.put("expend", expend);
|
||||
PayReplyMapping.putCallback(payParam.getOrderNo(), callback);
|
||||
logger.debug("paymentParams: {}", paymentParams.toJSONString());
|
||||
return Payment.create(paymentParams, String.valueOf(deptId));
|
||||
return Payment.create(paymentParams, deptId.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -311,7 +302,7 @@ public class AdapayService {
|
|||
* @param refundAmt [必填项]退款金额，若退款金额小于原交易金额，则认为是部分退款，必须大于0，保留两位小数点，如0.10、100.05等
|
||||
* @return 同步返回一个 退款对象 https://docs.adapay.tech/api/trade.html#create-refund-params
|
||||
*/
|
||||
public Map<String, Object> refund(@NotNull RefundCallback callback, @NotNull String paymentId,
|
||||
public Map<String, Object> refund(@NotNull Long deptId, @NotNull RefundCallback callback, @NotNull String paymentId,
|
||||
@NotNull String refundOrderNo, @NotNull String refundAmt) throws BaseAdaPayException {
|
||||
Assert.notNull(callback, "callback is null!");
|
||||
Assert.hasText(paymentId, "paymentId is blank!");
|
||||
|
|
@ -321,7 +312,7 @@ public class AdapayService {
|
|||
refundParams.put("refund_amt", refundAmt);
|
||||
refundParams.put("refund_order_no", refundOrderNo);
|
||||
RefundReplyMapping.putCallback(paymentId, callback);
|
||||
return Refund.create(paymentId, refundParams);
|
||||
return Refund.create(paymentId, refundParams, deptId.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -338,13 +329,13 @@ public class AdapayService {
|
|||
* @param expend 扩展域
|
||||
* @return 关单的结果将通过一个 JSON 同步返回 https://docs.adapay.tech/api/trade.html#close-payment-response
|
||||
*/
|
||||
public Map<String, Object> close(String paymentId, String reason, String expend) throws BaseAdaPayException {
|
||||
public Map<String, Object> close(@NotNull Long deptId, String paymentId, String reason, String expend) throws BaseAdaPayException {
|
||||
Assert.hasText(paymentId, "paymentId is blank!");
|
||||
Map<String, Object> paymentParams = new HashMap<>(4);
|
||||
paymentParams.put("payment_id", paymentId);
|
||||
paymentParams.put("reason", reason);
|
||||
paymentParams.put("expend", expend);
|
||||
return Payment.close(paymentParams);
|
||||
return Payment.close(paymentParams, deptId.toString());
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue