Skip to content

Commit cea482a

Browse files
binarywangbinarywang
committed
优化及规范部分新提交代码
1 parent a0584e1 commit cea482a

File tree

2 files changed

+22
-81
lines changed

2 files changed

+22
-81
lines changed

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
313313
* 请求方式：POST
314314
* </pre>
315315
*
316-
* @param mchBillNo 商户发放红包的商户订单号，比如10000098201411111234567890
316+
* @param request 红包查询请求
317317
* @return the wx pay redpack query result
318318
* @throws WxPayException the wx pay exception
319319
*/
@@ -691,10 +691,7 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
691691
* 文档地址：https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_17&index=10
692692
* </pre>
693693
*
694-
* @param beginDate 开始时间
695-
* @param endDate 结束时间
696-
* @param offset 位移
697-
* @param limit 条数，建议填null，否则接口会报签名错误
694+
* @param request 查询请求
698695
* @return the string
699696
* @throws WxPayException the wx pay exception
700697
*/

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java

Lines changed: 20 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,17 @@
11
package com.github.binarywang.wxpay.service.impl;
22

3-
import java.io.File;
4-
import java.nio.charset.StandardCharsets;
5-
import java.nio.file.Files;
6-
import java.nio.file.Path;
7-
import java.nio.file.Paths;
8-
import java.util.Date;
9-
import java.util.HashMap;
10-
import java.util.LinkedList;
11-
import java.util.List;
12-
import java.util.Map;
13-
import java.util.zip.ZipException;
14-
15-
import org.apache.commons.lang3.StringUtils;
16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
18-
193
import com.github.binarywang.utils.qrcode.QrcodeUtils;
204
import com.github.binarywang.wxpay.bean.WxPayApiData;
21-
import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryRequest;
22-
import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryResult;
23-
import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
24-
import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
25-
import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryRequest;
26-
import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryResult;
5+
import com.github.binarywang.wxpay.bean.coupon.*;
276
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
287
import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
298
import com.github.binarywang.wxpay.bean.notify.WxScanPayNotifyResult;
309
import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;
3110
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
3211
import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult;
3312
import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
34-
import com.github.binarywang.wxpay.bean.request.WxPayAuthcode2OpenidRequest;
35-
import com.github.binarywang.wxpay.bean.request.WxPayDefaultRequest;
36-
import com.github.binarywang.wxpay.bean.request.WxPayDownloadBillRequest;
37-
import com.github.binarywang.wxpay.bean.request.WxPayDownloadFundFlowRequest;
38-
import com.github.binarywang.wxpay.bean.request.WxPayMicropayRequest;
39-
import com.github.binarywang.wxpay.bean.request.WxPayOrderCloseRequest;
40-
import com.github.binarywang.wxpay.bean.request.WxPayOrderQueryRequest;
41-
import com.github.binarywang.wxpay.bean.request.WxPayOrderReverseRequest;
42-
import com.github.binarywang.wxpay.bean.request.WxPayQueryCommentRequest;
43-
import com.github.binarywang.wxpay.bean.request.WxPayRedpackQueryRequest;
44-
import com.github.binarywang.wxpay.bean.request.WxPayRefundQueryRequest;
45-
import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
46-
import com.github.binarywang.wxpay.bean.request.WxPayReportRequest;
47-
import com.github.binarywang.wxpay.bean.request.WxPaySendRedpackRequest;
48-
import com.github.binarywang.wxpay.bean.request.WxPayShorturlRequest;
49-
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
50-
import com.github.binarywang.wxpay.bean.result.BaseWxPayResult;
51-
import com.github.binarywang.wxpay.bean.result.WxPayAuthcode2OpenidResult;
52-
import com.github.binarywang.wxpay.bean.result.WxPayBillResult;
53-
import com.github.binarywang.wxpay.bean.result.WxPayCommonResult;
54-
import com.github.binarywang.wxpay.bean.result.WxPayFundFlowBaseResult;
55-
import com.github.binarywang.wxpay.bean.result.WxPayFundFlowResult;
56-
import com.github.binarywang.wxpay.bean.result.WxPayMicropayResult;
57-
import com.github.binarywang.wxpay.bean.result.WxPayOrderCloseResult;
58-
import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult;
59-
import com.github.binarywang.wxpay.bean.result.WxPayOrderReverseResult;
60-
import com.github.binarywang.wxpay.bean.result.WxPayRedpackQueryResult;
61-
import com.github.binarywang.wxpay.bean.result.WxPayRefundQueryResult;
62-
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
63-
import com.github.binarywang.wxpay.bean.result.WxPaySandboxSignKeyResult;
64-
import com.github.binarywang.wxpay.bean.result.WxPaySendRedpackResult;
65-
import com.github.binarywang.wxpay.bean.result.WxPayShorturlResult;
66-
import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
13+
import com.github.binarywang.wxpay.bean.request.*;
14+
import com.github.binarywang.wxpay.bean.result.*;
6715
import com.github.binarywang.wxpay.config.WxPayConfig;
6816
import com.github.binarywang.wxpay.constant.WxPayConstants.BillType;
6917
import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
@@ -75,6 +23,17 @@
7523
import com.google.common.base.Joiner;
7624
import com.google.common.collect.Maps;
7725
import jodd.io.ZipUtil;
26+
import org.apache.commons.lang3.StringUtils;
27+
import org.slf4j.Logger;
28+
import org.slf4j.LoggerFactory;
29+
30+
import java.io.File;
31+
import java.nio.charset.StandardCharsets;
32+
import java.nio.file.Files;
33+
import java.nio.file.Path;
34+
import java.nio.file.Paths;
35+
import java.util.*;
36+
import java.util.zip.ZipException;
7837

7938
import static com.github.binarywang.wxpay.constant.WxPayConstants.QUERY_COMMENT_DATE_FORMAT;
8039
import static com.github.binarywang.wxpay.constant.WxPayConstants.TarType;
@@ -142,7 +101,7 @@ public WxPayRefundResult refund(WxPayRefundRequest request) throws WxPayExceptio
142101

143102
String url = this.getPayBaseUrl() + "/secapi/pay/refund";
144103
if (this.getConfig().isUseSandboxEnv()) {
145-
url = PAY_BASE_URL + "/sandboxnew/pay/refund";
104+
url = PAY_BASE_URL + "/sandboxnew/pay/refund";
146105
}
147106

148107
String responseContent = this.post(url, request.toXML(), true);
@@ -242,15 +201,9 @@ public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request) throw
242201
public WxPayRedpackQueryResult queryRedpack(String mchBillNo) throws WxPayException {
243202
WxPayRedpackQueryRequest request = new WxPayRedpackQueryRequest();
244203
request.setMchBillNo(mchBillNo);
245-
request.setBillType(BillType.MCHT);
246-
request.checkAndSign(this.getConfig());
247-
248-
String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gethbinfo";
249-
String responseContent = this.post(url, request.toXML(), true);
250-
WxPayRedpackQueryResult result = BaseWxPayResult.fromXML(responseContent, WxPayRedpackQueryResult.class);
251-
result.checkResult(this, request.getSignType(), true);
252-
return result;
204+
return this.queryRedpack(request);
253205
}
206+
254207
@Override
255208
public WxPayRedpackQueryResult queryRedpack(WxPayRedpackQueryRequest request) throws WxPayException {
256209
request.setBillType(BillType.MCHT);
@@ -820,25 +773,16 @@ public String queryComment(Date beginDate, Date endDate, Integer offset, Integer
820773
request.setEndTime(QUERY_COMMENT_DATE_FORMAT.format(endDate));
821774
request.setOffset(offset);
822775
request.setLimit(limit);
823-
request.setSignType(SignType.HMAC_SHA256);
824-
825-
request.checkAndSign(this.getConfig());
826776

827-
String url = this.getPayBaseUrl() + "/billcommentsp/batchquerycomment";
828-
829-
String responseContent = this.post(url, request.toXML(), true);
830-
if (responseContent.startsWith("<")) {
831-
throw WxPayException.from(BaseWxPayResult.fromXML(responseContent, WxPayCommonResult.class));
832-
}
833-
834-
return responseContent;
777+
return this.queryComment(request);
835778
}
779+
836780
@Override
837781
public String queryComment(WxPayQueryCommentRequest request) throws WxPayException {
838782
request.checkAndSign(this.getConfig());
839783
request.setSignType(SignType.HMAC_SHA256);
840-
String url = this.getPayBaseUrl() + "/billcommentsp/batchquerycomment";
841784

785+
String url = this.getPayBaseUrl() + "/billcommentsp/batchquerycomment";
842786
String responseContent = this.post(url, request.toXML(), true);
843787
if (responseContent.startsWith("<")) {
844788
throw WxPayException.from(BaseWxPayResult.fromXML(responseContent, WxPayCommonResult.class));

0 commit comments

Comments
 (0)