|
1 | 1 | package com.github.binarywang.wxpay.service.impl;
|
2 | 2 |
|
| 3 | +import java.io.File; |
| 4 | +import java.io.IOException; |
| 5 | +import java.nio.charset.StandardCharsets; |
| 6 | +import java.nio.file.Files; |
| 7 | +import java.nio.file.Path; |
| 8 | +import java.nio.file.Paths; |
| 9 | +import java.util.Date; |
| 10 | +import java.util.HashMap; |
| 11 | +import java.util.LinkedList; |
| 12 | +import java.util.List; |
| 13 | +import java.util.Map; |
| 14 | +import java.util.zip.ZipException; |
| 15 | + |
| 16 | +import org.apache.commons.lang3.StringUtils; |
| 17 | +import org.slf4j.Logger; |
| 18 | +import org.slf4j.LoggerFactory; |
| 19 | + |
3 | 20 | import com.github.binarywang.utils.qrcode.QrcodeUtils;
|
4 | 21 | import com.github.binarywang.wxpay.bean.WxPayApiData;
|
5 |
| -import com.github.binarywang.wxpay.bean.coupon.*; |
| 22 | +import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryRequest; |
| 23 | +import com.github.binarywang.wxpay.bean.coupon.WxPayCouponInfoQueryResult; |
| 24 | +import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest; |
| 25 | +import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult; |
| 26 | +import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryRequest; |
| 27 | +import com.github.binarywang.wxpay.bean.coupon.WxPayCouponStockQueryResult; |
6 | 28 | import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
|
7 | 29 | import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
|
8 | 30 | import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;
|
9 | 31 | import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
|
10 | 32 | import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
|
11 |
| -import com.github.binarywang.wxpay.bean.request.*; |
12 |
| -import com.github.binarywang.wxpay.bean.result.*; |
| 33 | +import com.github.binarywang.wxpay.bean.request.WxPayAuthcode2OpenidRequest; |
| 34 | +import com.github.binarywang.wxpay.bean.request.WxPayDefaultRequest; |
| 35 | +import com.github.binarywang.wxpay.bean.request.WxPayDownloadBillRequest; |
| 36 | +import com.github.binarywang.wxpay.bean.request.WxPayMicropayRequest; |
| 37 | +import com.github.binarywang.wxpay.bean.request.WxPayOrderCloseRequest; |
| 38 | +import com.github.binarywang.wxpay.bean.request.WxPayOrderQueryRequest; |
| 39 | +import com.github.binarywang.wxpay.bean.request.WxPayOrderReverseRequest; |
| 40 | +import com.github.binarywang.wxpay.bean.request.WxPayQueryCommentRequest; |
| 41 | +import com.github.binarywang.wxpay.bean.request.WxPayRedpackQueryRequest; |
| 42 | +import com.github.binarywang.wxpay.bean.request.WxPayRefundQueryRequest; |
| 43 | +import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest; |
| 44 | +import com.github.binarywang.wxpay.bean.request.WxPayReportRequest; |
| 45 | +import com.github.binarywang.wxpay.bean.request.WxPaySendRedpackRequest; |
| 46 | +import com.github.binarywang.wxpay.bean.request.WxPayShorturlRequest; |
| 47 | +import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; |
| 48 | +import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; |
| 49 | +import com.github.binarywang.wxpay.bean.result.WxPayAuthcode2OpenidResult; |
| 50 | +import com.github.binarywang.wxpay.bean.result.WxPayBillBaseResult; |
| 51 | +import com.github.binarywang.wxpay.bean.result.WxPayBillResult; |
| 52 | +import com.github.binarywang.wxpay.bean.result.WxPayCommonResult; |
| 53 | +import com.github.binarywang.wxpay.bean.result.WxPayMicropayResult; |
| 54 | +import com.github.binarywang.wxpay.bean.result.WxPayOrderCloseResult; |
| 55 | +import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult; |
| 56 | +import com.github.binarywang.wxpay.bean.result.WxPayOrderReverseResult; |
| 57 | +import com.github.binarywang.wxpay.bean.result.WxPayRedpackQueryResult; |
| 58 | +import com.github.binarywang.wxpay.bean.result.WxPayRefundQueryResult; |
| 59 | +import com.github.binarywang.wxpay.bean.result.WxPayRefundResult; |
| 60 | +import com.github.binarywang.wxpay.bean.result.WxPaySandboxSignKeyResult; |
| 61 | +import com.github.binarywang.wxpay.bean.result.WxPaySendRedpackResult; |
| 62 | +import com.github.binarywang.wxpay.bean.result.WxPayShorturlResult; |
| 63 | +import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult; |
13 | 64 | import com.github.binarywang.wxpay.config.WxPayConfig;
|
14 | 65 | import com.github.binarywang.wxpay.constant.WxPayConstants.BillType;
|
15 | 66 | import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
|
|
21 | 72 | import com.google.common.base.Joiner;
|
22 | 73 | import com.google.common.collect.Maps;
|
23 | 74 | import jodd.io.ZipUtil;
|
24 |
| -import org.apache.commons.lang3.StringUtils; |
25 |
| -import org.slf4j.Logger; |
26 |
| -import org.slf4j.LoggerFactory; |
27 |
| - |
28 |
| -import java.io.File; |
29 |
| -import java.io.IOException; |
30 |
| -import java.nio.charset.StandardCharsets; |
31 |
| -import java.nio.file.Files; |
32 |
| -import java.nio.file.Path; |
33 |
| -import java.nio.file.Paths; |
34 |
| -import java.util.*; |
35 |
| -import java.util.zip.ZipException; |
36 | 75 |
|
37 | 76 | import static com.github.binarywang.wxpay.constant.WxPayConstants.QUERY_COMMENT_DATE_FORMAT;
|
38 | 77 | import static com.github.binarywang.wxpay.constant.WxPayConstants.TarType;
|
@@ -125,7 +164,7 @@ public WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData) throws WxPa
|
125 | 164 | log.debug("微信支付异步通知请求参数:{}", xmlData);
|
126 | 165 | WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
|
127 | 166 | log.debug("微信支付异步通知请求解析后的对象:{}", result);
|
128 |
| - result.checkResult(this, null, false); |
| 167 | + result.checkResult(this, this.getConfig().getSignType(), false); |
129 | 168 | return result;
|
130 | 169 | } catch (WxPayException e) {
|
131 | 170 | log.error(e.getMessage(), e);
|
|
0 commit comments