mirror of
https://gitee.com/egzosn/pay-java-parent.git
synced 2026-05-19 07:31:36 +08:00
2.14.10, 还原jdk8,移除不用字段
This commit is contained in:
@@ -35,7 +35,7 @@ public class YiJiPayConfigStorage extends BasePayConfigStorage {
|
||||
|
||||
@Override
|
||||
public String getAppid() {
|
||||
return null;
|
||||
return partnerId;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -46,7 +46,7 @@ public class YiJiPayConfigStorage extends BasePayConfigStorage {
|
||||
*/
|
||||
@Override
|
||||
public String getAppId() {
|
||||
return null;
|
||||
return partnerId;
|
||||
}
|
||||
|
||||
|
||||
@@ -55,15 +55,11 @@ public class YiJiPayConfigStorage extends BasePayConfigStorage {
|
||||
*/
|
||||
@Override
|
||||
public String getPid() {
|
||||
return partnerId;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getSeller() {
|
||||
return sellerUserId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public String getSellerUserId() {
|
||||
return sellerUserId;
|
||||
}
|
||||
|
||||
@@ -170,8 +170,8 @@ public class YiJiPayService extends BasePayService<YiJiPayConfigStorage> {
|
||||
orderInfo.put("orderNo", order.getOutTradeNo());
|
||||
orderInfo.put("outOrderNo", order.getOutTradeNo());
|
||||
|
||||
if (StringUtils.isNotEmpty(payConfigStorage.getSeller())) {
|
||||
orderInfo.put("sellerUserId", payConfigStorage.getSeller());
|
||||
if (StringUtils.isNotEmpty(payConfigStorage.getSellerUserId())) {
|
||||
orderInfo.put("sellerUserId", payConfigStorage.getSellerUserId());
|
||||
}
|
||||
|
||||
((YiJiTransactionType) order.getTransactionType()).setAttribute(orderInfo, order);
|
||||
@@ -195,7 +195,7 @@ public class YiJiPayService extends BasePayService<YiJiPayConfigStorage> {
|
||||
*/
|
||||
private Map<String, Object> getPublicParameters(TransactionType transactionType) {
|
||||
Map<String, Object> orderInfo = new TreeMap<>();
|
||||
orderInfo.put("partnerId", payConfigStorage.getPid());
|
||||
orderInfo.put("partnerId", payConfigStorage.getPartnerId());
|
||||
orderInfo.put("returnUrl", payConfigStorage.getReturnUrl());
|
||||
orderInfo.put("notifyUrl", payConfigStorage.getNotifyUrl());
|
||||
orderInfo.put("service", transactionType.getMethod());
|
||||
|
||||
Reference in New Issue
Block a user