From 5e2cce681ea2386dbe0914fb4e9701bd1509f2cb Mon Sep 17 00:00:00 2001 From: zaosheng Date: Fri, 2 Jan 2026 11:01:49 +0800 Subject: [PATCH] =?UTF-8?q?2.14.10,=20=E8=BF=98=E5=8E=9Fjdk8,=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E7=94=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/ali/api/AliPayConfigStorage.java | 1 - .../com/egzosn/pay/ali/api/AliPayService.java | 1 + .../pay/baidu/api/BaiduPayConfigStorage.java | 6 ----- .../pay/common/api/PayConfigStorage.java | 6 ----- .../demo/controller/UnionPayController.java | 2 +- .../controller/WxV3CombinePayController.java | 1 - .../demo/controller/WxV3PayController.java | 7 +++--- .../service/handler/AliPayMessageHandler.java | 3 --- .../pay/fuiou/api/FuiouPayConfigStorage.java | 4 ---- .../payoneer/api/PayoneerConfigStorage.java | 11 ++++----- .../pay/payoneer/api/PayoneerPayService.java | 4 ++-- .../pay/paypal/api/PayPalConfigStorage.java | 1 - .../pay/paypal/v2/api/PayPalPayService.java | 2 +- .../pay/union/api/UnionPayConfigStorage.java | 12 ---------- .../api/WxYouDianPayConfigStorage.java | 16 ++++++++----- .../wx/youdian/api/WxYouDianPayService.java | 2 +- .../egzosn/pay/wx/api/WxPayConfigStorage.java | 6 ----- .../pay/wx/v3/api/WxCombinePayService.java | 12 ++++------ .../pay/wx/v3/api/WxParameterStructure.java | 8 +++---- .../pay/wx/v3/api/WxPayAssistService.java | 9 ++++---- .../pay/wx/v3/api/WxPayConfigStorage.java | 5 ---- .../pay/wx/v3/api/WxProfitSharingService.java | 23 ++++--------------- .../pay/yiji/api/YiJiPayConfigStorage.java | 12 ++++------ .../egzosn/pay/yiji/api/YiJiPayService.java | 6 ++--- pom.xml | 8 +++---- 25 files changed, 51 insertions(+), 117 deletions(-) diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java index 2acb5a6..611df9d 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayConfigStorage.java @@ -107,7 +107,6 @@ public class AliPayConfigStorage extends BasePayConfigStorage { this.pid = pid; } - @Override public String getSeller() { return seller; } diff --git a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java index 41ba432..493a799 100644 --- a/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java +++ b/pay-java-ali/src/main/java/com/egzosn/pay/ali/api/AliPayService.java @@ -66,6 +66,7 @@ import com.egzosn.pay.common.util.str.StringUtils; public class AliPayService extends BasePayService implements TransferService, AliPayServiceInf { + /** * api服务地址，默认为国内 */ diff --git a/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java index 61ee1cd..4cb5afa 100644 --- a/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java +++ b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java @@ -27,12 +27,6 @@ public class BaiduPayConfigStorage extends BasePayConfigStorage { return getDealId(); } - //使用json序列化的时候会报错，所以不要直接抛出异常 - @Override - public String getSeller() { - return getDealId(); - } - public String getDealId() { return dealId; } diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayConfigStorage.java b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayConfigStorage.java index e207511..3ec307a 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayConfigStorage.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/api/PayConfigStorage.java @@ -45,12 +45,6 @@ public interface PayConfigStorage extends Attrs { */ String getPid(); - /** - * 获取收款账号 - * - * @return 收款账号 - */ - String getSeller(); /** * 授权令牌 diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java index 4a8ff59..0a37d3d 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java @@ -13,7 +13,7 @@ import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; + import static com.egzosn.pay.union.bean.UnionTransactionType.WEB; diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3CombinePayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3CombinePayController.java index 7274f1d..7e07ad6 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3CombinePayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3CombinePayController.java @@ -8,7 +8,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3PayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3PayController.java index fd1887e..3db9be1 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3PayController.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxV3PayController.java @@ -25,7 +25,6 @@ import com.egzosn.pay.common.bean.RefundResult; import com.egzosn.pay.demo.request.QueryOrder; import com.egzosn.pay.demo.service.handler.WxV3PayMessageHandler; import com.egzosn.pay.web.support.HttpRequestNoticeParams; -import com.egzosn.pay.wx.v3.api.WxPayConfigStorage; import com.egzosn.pay.wx.v3.api.WxPayService; import com.egzosn.pay.wx.v3.bean.WxTransactionType; import com.egzosn.pay.wx.v3.bean.WxTransferType; @@ -52,7 +51,7 @@ public class WxV3PayController { // @PostConstruct //没有证书的情况下注释掉，避免启动报错 - public void init() { + public void init() throws IOException { com.egzosn.pay.wx.v3.api.WxPayConfigStorage wxPayConfigStorage = new com.egzosn.pay.wx.v3.api.WxPayConfigStorage(); wxPayConfigStorage.setAppId("wx5ce9f1a2****"); wxPayConfigStorage.setMchId("170330*****"); @@ -70,11 +69,11 @@ public class WxV3PayController { wxPayConfigStorage.setInputCharset("utf-8"); //使用证书时设置为true // wxPayConfigStorage.setCertSign(true); - /使用P12证书方式, 商户API证书 https://pay.weixin.qq.com/wiki/doc/apiv3/wechatpay/wechatpay3_1.shtml + //使用P12证书方式, 商户API证书 https://pay.weixin.qq.com/wiki/doc/apiv3/wechatpay/wechatpay3_1.shtml // wxPayConfigStorage.setApiClientKeyP12("http://pay.egzosn.com/yifenli_mall.p12"); // wxPayConfigStorage.setCertStoreType(CertStoreType.URL); //使用pem证书方式 - wxPayConfigStorage.setKeyPrivate(Files.readString(Paths.get("wechatpay/apiclient_key.pem"))); + wxPayConfigStorage.setKeyPrivate(new String(Files.readAllBytes(Paths.get("wechatpay/apiclient_key.pem")))); wxPayConfigStorage.setMerchantSerialNumber("2C1230A7BA8C7B197FC90852CCA****"); com.egzosn.pay.wx.v3.api.WxPayService service = new com.egzosn.pay.wx.v3.api.WxPayService(wxPayConfigStorage); diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/AliPayMessageHandler.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/AliPayMessageHandler.java index b994349..3bad34a 100644 --- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/AliPayMessageHandler.java +++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/service/handler/AliPayMessageHandler.java @@ -3,10 +3,7 @@ package com.egzosn.pay.demo.service.handler; import com.egzosn.pay.ali.api.AliPayService; import com.egzosn.pay.ali.bean.AliPayMessage; import com.egzosn.pay.common.api.PayMessageHandler; -import com.egzosn.pay.common.api.PayService; -import com.egzosn.pay.common.bean.PayMessage; import com.egzosn.pay.common.bean.PayOutMessage; -import com.egzosn.pay.common.bean.outbuilder.TextBuilder; import com.egzosn.pay.common.exception.PayErrorException; import org.springframework.stereotype.Component; diff --git a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java index af8f37c..48d0739 100644 --- a/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java +++ b/pay-java-fuiou/src/main/java/com/egzosn/pay/fuiou/api/FuiouPayConfigStorage.java @@ -53,9 +53,5 @@ public class FuiouPayConfigStorage extends BasePayConfigStorage { this.mchntCd = mchntCd; } - @Override - public String getSeller() { - return null; - } } diff --git a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerConfigStorage.java b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerConfigStorage.java index 979eea2..a71acec 100644 --- a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerConfigStorage.java +++ b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerConfigStorage.java @@ -30,7 +30,7 @@ public class PayoneerConfigStorage extends BasePayConfigStorage { @Override @Deprecated public String getAppid() { - return null; + return programId; } /** @@ -41,7 +41,7 @@ public class PayoneerConfigStorage extends BasePayConfigStorage { */ @Override public String getAppId() { - return null; + return programId; } @@ -50,14 +50,11 @@ public class PayoneerConfigStorage extends BasePayConfigStorage { */ @Override public String getPid() { - return programId; - } - - @Override - public String getSeller() { return userName; } + + /** * 获取商户Id * diff --git a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java index fbc74a9..0c1e8b8 100644 --- a/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java +++ b/pay-java-payoneer/src/main/java/com/egzosn/pay/payoneer/api/PayoneerPayService.java @@ -87,7 +87,7 @@ public class PayoneerPayService extends BasePayService im private HttpHeader authHeader() { List
headers = new ArrayList<>(); - headers.add(new BasicHeader("Authorization", "Basic " + authorizationString(getPayConfigStorage().getSeller(), getPayConfigStorage().getKeyPrivate()))); + headers.add(new BasicHeader("Authorization", "Basic " + authorizationString(getPayConfigStorage().getPid(), getPayConfigStorage().getKeyPrivate()))); return new HttpHeader(headers); } @@ -498,7 +498,7 @@ public class PayoneerPayService extends BasePayService im */ @Override public String getReqUrl(TransactionType type) { - return (payConfigStorage.isTest() ? SANDBOX_DOMAIN : RELEASE_DOMAIN) + payConfigStorage.getPid() + "/" + type.getMethod(); + return (payConfigStorage.isTest() ? SANDBOX_DOMAIN : RELEASE_DOMAIN) + payConfigStorage.getAppId() + "/" + type.getMethod(); } diff --git a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalConfigStorage.java b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalConfigStorage.java index 69c5a89..68c3aba 100644 --- a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalConfigStorage.java +++ b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/api/PayPalConfigStorage.java @@ -44,7 +44,6 @@ public class PayPalConfigStorage extends BasePayConfigStorage { return clientId; } - @Override public String getSeller() { return clientId; } diff --git a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java index e6cce20..0eb9cf5 100644 --- a/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java +++ b/pay-java-paypal/src/main/java/com/egzosn/pay/paypal/v2/api/PayPalPayService.java @@ -64,7 +64,7 @@ import com.egzosn.pay.paypal.v2.utils.PayPalUtil; * @author egan *

* email egzosn@gmail.com - * date 2021-1-16 ‏‎22:15:09 + * date 2021-1-16 22:15:09 */ public class PayPalPayService extends BasePayService implements PayPalPayServiceInf { diff --git a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java index 010ed7d..093dca1 100644 --- a/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java +++ b/pay-java-union/src/main/java/com/egzosn/pay/union/api/UnionPayConfigStorage.java @@ -22,10 +22,6 @@ public class UnionPayConfigStorage extends BasePayConfigStorage { */ private String merId; - /** - * 商户收款账号 - */ - private String seller; private String version = "5.1.0"; /** @@ -195,14 +191,6 @@ public class UnionPayConfigStorage extends BasePayConfigStorage { this.merId = pid; } - @Override - public String getSeller() { - return seller; - } - - public void setSeller(String seller) { - this.seller = seller; - } public String getMerId() { return merId; diff --git a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayConfigStorage.java b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayConfigStorage.java index 8888db6..bbd4315 100644 --- a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayConfigStorage.java +++ b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayConfigStorage.java @@ -18,7 +18,7 @@ public class WxYouDianPayConfigStorage extends BasePayConfigStorage { /** * 账号 */ - public String seller; + public String pid; @Override @@ -40,16 +40,20 @@ public class WxYouDianPayConfigStorage extends BasePayConfigStorage { @Override public String getPid() { - return null; + return pid; } - public void setSeller(String seller) { - this.seller = seller; + public void setPid(String pid) { + this.pid = pid; } - @Override + public void setSeller(String pid) { + this.pid = pid; + } + + public String getSeller() { - return seller; + return pid; } diff --git a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java index d16cdd8..986b045 100644 --- a/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java +++ b/pay-java-wx-youdian/src/main/java/com/egzosn/pay/wx/youdian/api/WxYouDianPayService.java @@ -108,7 +108,7 @@ public class WxYouDianPayService extends BasePayService data = new TreeMap<>(); - data.put("username", payConfigStorage.getSeller()); + data.put("username", payConfigStorage.getPid()); data.put("password", payConfigStorage.getKeyPrivate()); String apbNonce = SignTextUtils.randomStr(); // 1、确定请求主体为用户登录，即需要传登录的用户名username和密码password并且要生成唯一的随机数命名为apb_nonce，长度为32位 diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayConfigStorage.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayConfigStorage.java index 11000b5..56df638 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayConfigStorage.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/api/WxPayConfigStorage.java @@ -55,12 +55,6 @@ public class WxPayConfigStorage extends BasePayConfigStorage { } - @Override - public String getSeller() { - return null; - } - - public String getMchId() { return mchId; } diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java index 7db1464..a5391d2 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxCombinePayService.java @@ -1,16 +1,9 @@ package com.egzosn.pay.wx.v3.api; -import java.util.LinkedHashMap; -import java.util.Map; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.egzosn.pay.common.bean.AssistOrder; -import com.egzosn.pay.common.bean.Order; -import com.egzosn.pay.common.bean.OrderParaStructure; -import com.egzosn.pay.common.bean.PayMessage; -import com.egzosn.pay.common.bean.PayOrder; +import com.egzosn.pay.common.bean.*; import com.egzosn.pay.common.bean.result.PayException; import com.egzosn.pay.common.exception.PayErrorException; import com.egzosn.pay.common.http.HttpConfigStorage; @@ -21,6 +14,9 @@ import com.egzosn.pay.wx.v3.bean.WxTransactionType; import com.egzosn.pay.wx.v3.bean.combine.CombinePayMessage; import com.egzosn.pay.wx.v3.utils.WxConst; +import java.util.LinkedHashMap; +import java.util.Map; + /** * 微信合单支付服务 * diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java index 21f2cbe..4a14416 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxParameterStructure.java @@ -1,15 +1,15 @@ package com.egzosn.pay.wx.v3.api; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; - import com.egzosn.pay.common.bean.AssistOrder; import com.egzosn.pay.common.bean.OrderParaStructure; import com.egzosn.pay.common.bean.PayOrder; import com.egzosn.pay.common.util.MapGen; import com.egzosn.pay.wx.v3.utils.WxConst; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; + /** * 微信参数构造器 * diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java index 92e45ef..441604e 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayAssistService.java @@ -1,14 +1,13 @@ package com.egzosn.pay.wx.v3.api; -import java.security.cert.Certificate; -import java.util.Map; - -import org.apache.http.HttpEntity; - import com.alibaba.fastjson.JSONObject; import com.egzosn.pay.common.bean.PayOrder; import com.egzosn.pay.common.bean.TransactionType; import com.egzosn.pay.common.http.ResponseEntity; +import org.apache.http.HttpEntity; + +import java.security.cert.Certificate; +import java.util.Map; /** * 微信支付辅助服务 diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayConfigStorage.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayConfigStorage.java index 800bf84..4cc46ca 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayConfigStorage.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxPayConfigStorage.java @@ -121,11 +121,6 @@ public class WxPayConfigStorage extends BasePayConfigStorage { } - @Override - public String getSeller() { - return mchId; - } - public String getMchId() { return mchId; diff --git a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxProfitSharingService.java b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxProfitSharingService.java index 71d6abb..0bb798d 100644 --- a/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxProfitSharingService.java +++ b/pay-java-wx/src/main/java/com/egzosn/pay/wx/v3/api/WxProfitSharingService.java @@ -1,26 +1,10 @@ package com.egzosn.pay.wx.v3.api; -import java.io.InputStream; -import java.util.Date; -import java.util.Map; - -import org.apache.http.message.BasicHeader; - import com.alibaba.fastjson.JSONObject; -import com.egzosn.pay.common.bean.AssistOrder; -import com.egzosn.pay.common.bean.BillType; -import com.egzosn.pay.common.bean.MethodType; -import com.egzosn.pay.common.bean.NoticeParams; -import com.egzosn.pay.common.bean.OrderParaStructure; -import com.egzosn.pay.common.bean.PayMessage; -import com.egzosn.pay.common.bean.PayOrder; -import com.egzosn.pay.common.bean.RefundOrder; -import com.egzosn.pay.common.bean.RefundResult; -import com.egzosn.pay.common.bean.TransferOrder; +import com.egzosn.pay.common.bean.*; import com.egzosn.pay.common.bean.result.PayException; import com.egzosn.pay.common.exception.PayErrorException; import com.egzosn.pay.common.http.HttpConfigStorage; -import com.egzosn.pay.common.http.HttpStringEntity; import com.egzosn.pay.common.http.UriVariables; import com.egzosn.pay.common.util.DateUtils; import com.egzosn.pay.common.util.MapGen; @@ -32,6 +16,10 @@ import com.egzosn.pay.wx.v3.bean.sharing.ProfitSharingPayMessage; import com.egzosn.pay.wx.v3.bean.sharing.WxProfitSharingReturnResult; import com.egzosn.pay.wx.v3.utils.WxConst; +import java.io.InputStream; +import java.util.Date; +import java.util.Map; + /** * 微信分账API服务 * @@ -121,7 +109,6 @@ public class WxProfitSharingService extends WxPayService implements ProfitSharin } - /** * 返回创建的订单信息 * diff --git a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayConfigStorage.java b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayConfigStorage.java index 8484c27..9c26741 100644 --- a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayConfigStorage.java +++ b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayConfigStorage.java @@ -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; } diff --git a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java index 7a93c0d..db2e095 100644 --- a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java +++ b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java @@ -170,8 +170,8 @@ public class YiJiPayService extends BasePayService { 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 { */ private Map getPublicParameters(TransactionType transactionType) { Map 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()); diff --git a/pom.xml b/pom.xml index e2aa0e0..7675ac4 100644 --- a/pom.xml +++ b/pom.xml @@ -64,16 +64,16 @@ - 2.14.9 + 2.14.10 4.5.4 1.2.17 1.2.83 3.3.1 4.0.1 1.59 - 17 - 17 - 17 + 8 + 8 + 8 UTF-8 UTF-8 1.1.0