Skip to content

Commit e39c259

Browse files
chanjarsterchanjarster
committed
Merge pull request #194 from ukid/develop
[BUG FIX]类型转换错误
2 parents 2f25436 + 6ede883 commit e39c259

File tree

2 files changed

+86
-19
lines changed

2 files changed

+86
-19
lines changed

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java

Lines changed: 67 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
package me.chanjar.weixin.mp.api;
22

3-
import com.google.gson.JsonArray;
4-
import com.google.gson.JsonElement;
5-
import com.google.gson.JsonObject;
6-
import com.google.gson.internal.Streams;
7-
import com.google.gson.reflect.TypeToken;
8-
import com.google.gson.stream.JsonReader;
9-
import com.thoughtworks.xstream.XStream;
3+
import java.io.File;
4+
import java.io.IOException;
5+
import java.io.InputStream;
6+
import java.io.StringReader;
7+
import java.security.NoSuchAlgorithmException;
8+
import java.util.ArrayList;
9+
import java.util.Collections;
10+
import java.util.Date;
11+
import java.util.HashMap;
12+
import java.util.List;
13+
import java.util.Map;
14+
import java.util.SortedMap;
15+
import java.util.TreeMap;
16+
import java.util.UUID;
17+
1018
import me.chanjar.weixin.common.api.WxConsts;
1119
import me.chanjar.weixin.common.bean.WxAccessToken;
1220
import me.chanjar.weixin.common.bean.WxJsapiSignature;
@@ -21,14 +29,53 @@
2129
import me.chanjar.weixin.common.util.crypto.SHA1;
2230
import me.chanjar.weixin.common.util.crypto.WxCryptUtil;
2331
import me.chanjar.weixin.common.util.fs.FileUtils;
24-
import me.chanjar.weixin.common.util.http.*;
32+
import me.chanjar.weixin.common.util.http.MediaDownloadRequestExecutor;
33+
import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
34+
import me.chanjar.weixin.common.util.http.RequestExecutor;
35+
import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
36+
import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
37+
import me.chanjar.weixin.common.util.http.URIUtil;
38+
import me.chanjar.weixin.common.util.http.Utf8ResponseHandler;
2539
import me.chanjar.weixin.common.util.json.GsonHelper;
2640
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
2741
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
28-
import me.chanjar.weixin.mp.bean.*;
29-
import me.chanjar.weixin.mp.bean.result.*;
30-
import me.chanjar.weixin.mp.util.http.*;
42+
import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
43+
import me.chanjar.weixin.mp.bean.WxMpGroup;
44+
import me.chanjar.weixin.mp.bean.WxMpMassGroupMessage;
45+
import me.chanjar.weixin.mp.bean.WxMpMassNews;
46+
import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
47+
import me.chanjar.weixin.mp.bean.WxMpMassVideo;
48+
import me.chanjar.weixin.mp.bean.WxMpMaterial;
49+
import me.chanjar.weixin.mp.bean.WxMpMaterialArticleUpdate;
50+
import me.chanjar.weixin.mp.bean.WxMpMaterialNews;
51+
import me.chanjar.weixin.mp.bean.WxMpSemanticQuery;
52+
import me.chanjar.weixin.mp.bean.WxMpTemplateMessage;
53+
import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
54+
import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
55+
import me.chanjar.weixin.mp.bean.result.WxMpMaterialCountResult;
56+
import me.chanjar.weixin.mp.bean.result.WxMpMaterialFileBatchGetResult;
57+
import me.chanjar.weixin.mp.bean.result.WxMpMaterialNewsBatchGetResult;
58+
import me.chanjar.weixin.mp.bean.result.WxMpMaterialUploadResult;
59+
import me.chanjar.weixin.mp.bean.result.WxMpMaterialVideoInfoResult;
60+
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
61+
import me.chanjar.weixin.mp.bean.result.WxMpPayCallback;
62+
import me.chanjar.weixin.mp.bean.result.WxMpPayResult;
63+
import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult;
64+
import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
65+
import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult;
66+
import me.chanjar.weixin.mp.bean.result.WxMpUser;
67+
import me.chanjar.weixin.mp.bean.result.WxMpUserCumulate;
68+
import me.chanjar.weixin.mp.bean.result.WxMpUserList;
69+
import me.chanjar.weixin.mp.bean.result.WxMpUserSummary;
70+
import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor;
71+
import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor;
72+
import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor;
73+
import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor;
74+
import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor;
75+
import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor;
3176
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
77+
78+
import org.apache.commons.codec.digest.DigestUtils;
3279
import org.apache.http.Consts;
3380
import org.apache.http.HttpHost;
3481
import org.apache.http.auth.AuthScope;
@@ -47,12 +94,13 @@
4794
import org.slf4j.Logger;
4895
import org.slf4j.LoggerFactory;
4996

50-
import java.io.File;
51-
import java.io.IOException;
52-
import java.io.InputStream;
53-
import java.io.StringReader;
54-
import java.security.NoSuchAlgorithmException;
55-
import java.util.*;
97+
import com.google.gson.JsonArray;
98+
import com.google.gson.JsonElement;
99+
import com.google.gson.JsonObject;
100+
import com.google.gson.internal.Streams;
101+
import com.google.gson.reflect.TypeToken;
102+
import com.google.gson.stream.JsonReader;
103+
import com.thoughtworks.xstream.XStream;
56104

57105
public class WxMpServiceImpl implements WxMpService {
58106

@@ -796,7 +844,7 @@ public Map<String, String> getJSSDKPayInfo(String openId, String outTradeNo, dou
796844
payInfo.put("signType", "MD5");
797845

798846
String finalSign = WxCryptUtil.createSign(payInfo, wxMpConfigStorage.getPartnerKey());
799-
payInfo.put("sign", finalSign);
847+
payInfo.put("paySign", finalSign);
800848
return payInfo;
801849
}
802850

@@ -846,7 +894,7 @@ public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo)
846894
public WxMpPayCallback getJSSDKCallbackData(String xmlData) {
847895
try {
848896
XStream xstream = XStreamInitializer.getInstance();
849-
xstream.alias("xml", WxMpPayResult.class);
897+
xstream.alias("xml", WxMpPayCallback.class);
850898
WxMpPayCallback wxMpCallback = (WxMpPayCallback) xstream.fromXML(xmlData);
851899
return wxMpCallback;
852900
} catch (Exception e){

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,4 +257,23 @@ public void setTime_end(String time_end) {
257257
this.time_end = time_end;
258258
}
259259

260+
@Override
261+
public String toString() {
262+
return "WxMpPayCallback [return_code=" + return_code + ", return_msg="
263+
+ return_msg + ", appid=" + appid + ", mch_id=" + mch_id
264+
+ ", device_info=" + device_info + ", nonce_str=" + nonce_str
265+
+ ", sign=" + sign + ", result_code=" + result_code
266+
+ ", err_code=" + err_code + ", err_code_des=" + err_code_des
267+
+ ", openid=" + openid + ", is_subscribe=" + is_subscribe
268+
+ ", trade_type=" + trade_type + ", bank_type=" + bank_type
269+
+ ", total_fee=" + total_fee + ", fee_type=" + fee_type
270+
+ ", cash_fee=" + cash_fee + ", cash_fee_type=" + cash_fee_type
271+
+ ", coupon_fee=" + coupon_fee + ", coupon_count="
272+
+ coupon_count + ", coupon_batch_id_$n=" + coupon_batch_id_$n
273+
+ ", coupon_id_$n=" + coupon_id_$n + ", coupon_fee_$n="
274+
+ coupon_fee_$n + ", transaction_id=" + transaction_id
275+
+ ", out_trade_no=" + out_trade_no + ", attach=" + attach
276+
+ ", time_end=" + time_end + "]";
277+
}
278+
260279
}

0 commit comments

Comments
 (0)