lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-10-15 18:55:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the bug that fails to query order due to sign error.

Browse Source
This commit is contained in:
Kane Zhu
2015-12-01 11:18:39 +08:00
parent 89a260dded
commit 5594c8852d
2 changed files with 228 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java
View File

@@ -892,44 +892,44 @@ public class WxMpServiceImpl implements WxMpService {
@Override @Override
public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) { public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) {
String nonce_str = System.currentTimeMillis() + ""; String nonce_str = System.currentTimeMillis() + "";
SortedMap<String, String> packageParams = new TreeMap<String, String>(); SortedMap<String, String> packageParams = new TreeMap<String, String>();
packageParams.put("appid", wxMpConfigStorage.getAppId()); packageParams.put("appid", wxMpConfigStorage.getAppId());
packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); packageParams.put("mch_id", wxMpConfigStorage.getPartnerId());
if (transactionId != null && !"".equals(transactionId.trim()))
packageParams.put("transaction_id", transactionId); packageParams.put("transaction_id", transactionId);
else if (outTradeNo != null && !"".equals(outTradeNo.trim()))
packageParams.put("out_trade_no", outTradeNo); packageParams.put("out_trade_no", outTradeNo);
packageParams.put("nonce_str", nonce_str); else
throw new IllegalArgumentException("Either 'transactionId' or 'outTradeNo' must be given.");
packageParams.put("nonce_str", nonce_str);
packageParams.put("sign", WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey()));
String sign = WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey()); StringBuilder request = new StringBuilder("<xml>");
String xml = "<xml>" + for (Entry<String, String> para : packageParams.entrySet()) {
"<appid>" + wxMpConfigStorage.getAppId() + "</appid>" + request.append(String.format("<%s>%s</%s>", para.getKey(), para.getValue(), para.getKey()));
"<mch_id>" + wxMpConfigStorage.getPartnerId() + "</mch_id>" + }
"<transaction_id>" + transactionId + "</transaction_id>" + request.append("</xml>");
"<out_trade_no>" + outTradeNo + "</out_trade_no>" +
"<nonce_str>" + nonce_str + "</nonce_str>" +
"<sign>" + sign + "</sign>" +
"</xml>";
HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery"); HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery");
if (httpProxy != null) { if (httpProxy != null) {
RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build();
httpPost.setConfig(config); httpPost.setConfig(config);
} }
StringEntity entity = new StringEntity(xml, Consts.UTF_8); StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8);
httpPost.setEntity(entity); httpPost.setEntity(entity);
try { try {
CloseableHttpResponse response = httpClient.execute(httpPost); CloseableHttpResponse response = httpClient.execute(httpPost);
String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
XStream xstream = XStreamInitializer.getInstance(); XStream xstream = XStreamInitializer.getInstance();
xstream.alias("xml", WxMpPayResult.class); xstream.alias("xml", WxMpPayResult.class);
WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent); WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent);
return wxMpPayResult; return wxMpPayResult;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); throw new RuntimeException("Failed to query order due to IO exception.", e);
} }
return new WxMpPayResult();
} }
@Override @Override

350
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java
View File

@@ -13,203 +13,245 @@ import java.io.Serializable;
* @author ukid * @author ukid
*/ */
public class WxMpPayResult implements Serializable { public class WxMpPayResult implements Serializable {
private String return_code; /**
private String return_msg; *
private String appid; */
private String mch_id; private static final long serialVersionUID = -570934170727777190L;
private String nonce_str;
private String sign; private String return_code;
private String result_code; private String return_msg;
private String err_code; private String appid;
private String err_code_des; private String mch_id;
private String trade_state; private String nonce_str;
private String device_info; private String sign;
private String openid; private String result_code;
private String is_subscribe; private String err_code;
private String trade_type; private String err_code_des;
private String bank_type; private String trade_state;
private String total_fee; private String trade_state_desc;
private String coupon_fee; private String device_info;
private String fee_type; private String openid;
private String transaction_id; private String is_subscribe;
private String out_trade_no; private String trade_type;
private String attach; private String bank_type;
private String time_end; private String total_fee;
private String coupon_fee;
private String fee_type;
private String transaction_id;
private String out_trade_no;
private String attach;
private String time_end;
public String getReturn_code() { public String getReturn_code() {
return return_code; return return_code;
} }
public String getReturn_msg() { public String getReturn_msg() {
return return_msg; return return_msg;
} }
public String getAppid() { public String getAppid() {
return appid; return appid;
} }
public String getMch_id() { public String getMch_id() {
return mch_id; return mch_id;
} }
public String getNonce_str() { public String getNonce_str() {
return nonce_str; return nonce_str;
} }
public String getSign() { public String getSign() {
return sign; return sign;
} }
public String getResult_code() { public String getResult_code() {
return result_code; return result_code;
} }
public String getErr_code() { public String getErr_code() {
return err_code; return err_code;
} }
public String getErr_code_des() { public String getErr_code_des() {
return err_code_des; return err_code_des;
} }
public String getTrade_state() { public String getTrade_state() {
return trade_state; return trade_state;
} }
public String getDevice_info() { public String getDevice_info() {
return device_info; return device_info;
} }
public String getOpenid() { public String getOpenid() {
return openid; return openid;
} }
public String getIs_subscribe() { public String getIs_subscribe() {
return is_subscribe; return is_subscribe;
} }
public String getTrade_type() { public String getTrade_type() {
return trade_type; return trade_type;
} }
public String getBank_type() { public String getBank_type() {
return bank_type; return bank_type;
} }
public String getTotal_fee() { public String getTotal_fee() {
return total_fee; return total_fee;
} }
public String getCoupon_fee() { public String getCoupon_fee() {
return coupon_fee; return coupon_fee;
} }
public String getFee_type() { public String getFee_type() {
return fee_type; return fee_type;
} }
public String getTransaction_id() { public String getTransaction_id() {
return transaction_id; return transaction_id;
} }
public String getOut_trade_no() { public String getOut_trade_no() {
return out_trade_no; return out_trade_no;
} }
public String getAttach() { public String getAttach() {
return attach; return attach;
} }
public String getTime_end() { public String getTime_end() {
return time_end; return time_end;
} }
public void setReturn_code(String return_code) { public void setReturn_code(String return_code) {
this.return_code = return_code; this.return_code = return_code;
} }
public void setReturn_msg(String return_msg) { public void setReturn_msg(String return_msg) {
this.return_msg = return_msg; this.return_msg = return_msg;
} }
public void setAppid(String appid) { public void setAppid(String appid) {
this.appid = appid; this.appid = appid;
} }
public void setMch_id(String mch_id) { public void setMch_id(String mch_id) {
this.mch_id = mch_id; this.mch_id = mch_id;
} }
public void setNonce_str(String nonce_str) { public void setNonce_str(String nonce_str) {
this.nonce_str = nonce_str; this.nonce_str = nonce_str;
} }
public void setSign(String sign) { public void setSign(String sign) {
this.sign = sign; this.sign = sign;
} }
public void setResult_code(String result_code) { public void setResult_code(String result_code) {
this.result_code = result_code; this.result_code = result_code;
} }
public void setErr_code(String err_code) { public void setErr_code(String err_code) {
this.err_code = err_code; this.err_code = err_code;
} }
public void setErr_code_des(String err_code_des) { public void setErr_code_des(String err_code_des) {
this.err_code_des = err_code_des; this.err_code_des = err_code_des;
} }
public void setTrade_state(String trade_state) { public void setTrade_state(String trade_state) {
this.trade_state = trade_state; this.trade_state = trade_state;
} }
public void setDevice_info(String device_info) { public void setDevice_info(String device_info) {
this.device_info = device_info; this.device_info = device_info;
} }
public void setOpenid(String openid) { public void setOpenid(String openid) {
this.openid = openid; this.openid = openid;
} }
public void setIs_subscribe(String is_subscribe) { public void setIs_subscribe(String is_subscribe) {
this.is_subscribe = is_subscribe; this.is_subscribe = is_subscribe;
} }
public void setTrade_type(String trade_type) { public void setTrade_type(String trade_type) {
this.trade_type = trade_type; this.trade_type = trade_type;
} }
public void setBank_type(String bank_type) { public void setBank_type(String bank_type) {
this.bank_type = bank_type; this.bank_type = bank_type;
} }
public void setTotal_fee(String total_fee) { public void setTotal_fee(String total_fee) {
this.total_fee = total_fee; this.total_fee = total_fee;
} }
public void setCoupon_fee(String coupon_fee) { public void setCoupon_fee(String coupon_fee) {
this.coupon_fee = coupon_fee; this.coupon_fee = coupon_fee;
} }
public void setFee_type(String fee_type) { public void setFee_type(String fee_type) {
this.fee_type = fee_type; this.fee_type = fee_type;
} }
public void setTransaction_id(String transaction_id) { public void setTransaction_id(String transaction_id) {
this.transaction_id = transaction_id; this.transaction_id = transaction_id;
} }
public void setOut_trade_no(String out_trade_no) { public void setOut_trade_no(String out_trade_no) {
this.out_trade_no = out_trade_no; this.out_trade_no = out_trade_no;
} }
public void setAttach(String attach) { public void setAttach(String attach) {
this.attach = attach; this.attach = attach;
} }
public void setTime_end(String time_end) { public void setTime_end(String time_end) {
this.time_end = time_end; this.time_end = time_end;
} }
public String getTrade_state_desc() {
return trade_state_desc;
}
public void setTrade_state_desc(String trade_state_desc) {
this.trade_state_desc = trade_state_desc;
}
@Override
public String toString() {
return "WxMpPayResult{" +
"return_code=" + return_code +
", return_msg='" + return_msg + '\'' +
", appid='" + appid + '\'' +
", mch_id='" + mch_id + '\'' +
", nonce_str='" + nonce_str + '\'' +
", sign='" + sign + '\'' +
", result_code='" + result_code + '\'' +
", err_code='" + err_code + '\'' +
", err_code_des='" + err_code_des + '\'' +
", trade_state=" + trade_state +
", trade_state_desc=" + trade_state_desc +
", device_info='" + device_info + '\'' +
", openid='" + openid + '\'' +
", is_subscribe='" + is_subscribe + '\'' +
", trade_type='" + trade_type + '\'' +
", bank_type='" + bank_type + '\'' +
", total_fee='" + total_fee + '\'' +
", coupon_fee='" + coupon_fee + '\'' +
", fee_type='" + fee_type + '\'' +
", transaction_id='" + transaction_id + '\'' +
", out_trade_no='" + out_trade_no + '\'' +
", attach='" + attach + '\'' +
", time_end='" + time_end + '\'' +
'}';
}
} }