Merge branches 'develop-Actinia' and 'master' of https://git.oschina.net/egzosn/pay-java-parent into develop-Actinia

# Conflicts:
#	README.md
This commit is contained in:
Actinia-517
2017-12-05 16:32:06 +08:00
9 changed files with 107 additions and 42 deletions

View File

@@ -51,8 +51,8 @@ public class ApyAccountRepository {
apyAccount2.setPartner("1469188802");
apyAccount2.setAppid("wx3344f4aed352deae");
// TODO 2017/2/9 16:20 author: egan sign_type只有单一key时public_key与private_key相等比如sign_type=MD5的情况
apyAccount2.setPublicKey("991ded0800933ccf8736ab4f7fc61095");
apyAccount2.setPrivateKey("991ded0800933ccf8736ab4f7fc61095");
apyAccount2.setPublicKey("991ded080***************f7fc61095");
apyAccount2.setPrivateKey("991ded080***************f7fc61095");
apyAccount2.setNotifyUrl("http://pay.egzosn.com/payBack2.json");
// 无需同步回调可不填
apyAccount2.setReturnUrl("http://pay.egzosn.com");

View File

@@ -111,4 +111,20 @@ public class QueryOrder {
public void setTransactionType(String transactionType) {
this.transactionType = transactionType;
}
@Override
public String toString() {
return "QueryOrder{" +
"payId=" + payId +
", tradeNo='" + tradeNo + '\'' +
", outTradeNo='" + outTradeNo + '\'' +
", refundAmount=" + refundAmount +
", totalAmount=" + totalAmount +
", billDate=" + billDate +
", billType='" + billType + '\'' +
", tradeNoOrBillDate=" + tradeNoOrBillDate +
", outTradeNoBillType='" + outTradeNoBillType + '\'' +
", transactionType='" + transactionType + '\'' +
'}';
}
}