Commit Graph
32 Commits
Author SHA1 Message Date
曾浩 9603199597 Merge remote-tracking branch 'wechat/develop' into develop 2020-09-28 14:05:58 +08:00
曾浩 d248c0e868 fix:字段错误 2020-09-28 14:05:45 +08:00
曾浩 a28a17a76b Merge remote-tracking branch 'wechat/develop' into develop 2020-09-27 09:20:21 +08:00
曾浩 f0f21e1432 Merge remote-tracking branch 'wechat/develop' into develop 2020-09-25 09:43:43 +08:00
曾浩 07edd5bc41 Merge remote-tracking branch 'wechat/develop' into develop 2020-09-23 17:44:32 +08:00
曾浩 7df0e7508d new:修改结算账户、退款查询 2020-09-23 10:26:19 +08:00
曾浩 58ac339beb new:分账查询、退款通知 2020-09-22 21:05:51 +08:00
曾浩 3b4bb74ce7 Merge remote-tracking branch 'wechat/develop' into develop 2020-09-22 13:31:12 +08:00
曾浩 203790064d fix:命名统一调整 2020-09-21 10:51:22 +08:00
曾浩 00bc9656b6 new:电商收付通商户、平台提现 2020-09-21 10:29:00 +08:00
曾浩 9b20c749ce new:电商收付通合单支付、普通支付查询 2020-09-21 09:53:54 +08:00
曾浩 aa2fe98895 Merge remote-tracking branch 'wechat/develop' into develop 2020-09-20 17:19:24 +08:00
曾浩 5b606fddf4 Merge remote-tracking branch 'wechat/develop' into develop 2020-09-17 10:45:44 +08:00
曾浩 60c63a51f1 fix:电商收付通回调通知测试 2020-09-17 10:45:30 +08:00
曾浩 e56289f4c8 Merge remote-tracking branch 'wechat/develop' into develop 2020-09-15 20:02:20 +08:00
曾浩 3fbeec4018 Merge remote-tracking branch 'wechat/develop' into develop 2020-09-14 09:13:15 +08:00
曾浩 c2552def43 Merge remote-tracking branch 'wechat/develop' into develop 2020-09-11 14:48:03 +08:00
曾浩 34f0d99df1 电商收付通支付调整 2020-09-11 11:23:47 +08:00
曾浩 4f157b08ea Merge remote-tracking branch 'wechat/develop' into develop
# Conflicts:
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/NotifyResponse.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java
2020-09-10 13:28:08 +08:00
曾浩 c8fc670f52 new:电商收付通支付回调处理 2020-09-10 11:02:47 +08:00
曾浩 b8d9a157f3 Merge remote-tracking branch 'wechat/develop' into develop
# Conflicts:
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
2020-09-10 11:02:31 +08:00
曾浩 f18c62b152 new:电商收付通支付回调处理 2020-09-10 11:00:33 +08:00
曾浩 97409a7fbc new:电商收付通普通支付 2020-09-08 15:02:46 +08:00
曾浩 9f6051634a Merge remote-tracking branch 'wechat/develop' into develop 2020-09-08 13:15:53 +08:00
曾浩 541899a5af Merge remote-tracking branch 'wechat/develop' into develop 2020-09-04 09:54:36 +08:00
曾浩 84b9b992b1 Merge remote-tracking branch 'wechat/develop' into develop 2020-08-30 08:57:06 +08:00
曾浩 e0d87ebe49 new:合单支付 2020-08-26 12:17:30 +08:00
曾浩 5db9706ba0 new:jsapi合单支付 2020-08-24 20:21:07 +08:00
曾浩 10e0ca568e art:微信服务商配置优化 2020-08-24 20:14:53 +08:00
曾浩 cee37531c7 Merge remote-tracking branch 'wechat/develop' into develop
# Conflicts:
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsRequest.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsResult.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ApplymentsStatusResult.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
2020-08-24 13:43:47 +08:00
曾浩 2b27ee9c9f new:电商收付通二级商户进件 2020-08-17 20:14:28 +08:00
曾浩 1812b233bb art:证书类配置读取优化调整 2020-08-17 13:32:42 +08:00