From b205b7bff259399a535dc40150ba90ec0732ed18 Mon Sep 17 00:00:00 2001 From: ukid Date: Thu, 21 May 2015 13:21:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9js=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=89=80=E9=9C=80=E5=8F=82=E6=95=B0=EF=BC=8C=E5=8E=BB=E6=8E=89?= =?UTF-8?q?jsapiTicket,=E5=A2=9E=E5=8A=A0appid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/common/bean/WxJsapiSignature.java | 21 +++++++++---------- .../weixin/mp/api/WxMpServiceImpl.java | 1 + 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java index af32310a..886fd360 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java @@ -6,11 +6,10 @@ import java.io.Serializable; * jspai signature */ public class WxJsapiSignature implements Serializable { - + private String appid; + private String noncestr; - private String jsapiTicket; - private long timestamp; private String url; @@ -33,14 +32,6 @@ public class WxJsapiSignature implements Serializable { this.noncestr = noncestr; } - public String getJsapiTicket() { - return jsapiTicket; - } - - public void setJsapiTicket(String jsapiTicket) { - this.jsapiTicket = jsapiTicket; - } - public long getTimestamp() { return timestamp; } @@ -57,4 +48,12 @@ public class WxJsapiSignature implements Serializable { this.url = url; } + public String getAppid() { + return appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java index 1e08a69f..fcad2d86 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java @@ -164,6 +164,7 @@ public class WxMpServiceImpl implements WxMpService { "url=" + url ); WxJsapiSignature jsapiSignature = new WxJsapiSignature(); + jsapiSignature.setAppid(wxMpConfigStorage.getAppId()); jsapiSignature.setTimestamp(timestamp); jsapiSignature.setNoncestr(noncestr); jsapiSignature.setUrl(url); From b27798209b0c3b139aab6194e7e6dbb1d12253ef Mon Sep 17 00:00:00 2001 From: ukid Date: Fri, 22 May 2015 10:50:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E6=94=AF=E4=BB=98=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/WxMpService.java | 9 +- .../weixin/mp/api/WxMpServiceImpl.java | 44 ++++ .../weixin/mp/bean/result/WxMpPayResult.java | 215 ++++++++++++++++++ .../mp/bean/result/WxMpPrepayIdResult.java | 5 +- 4 files changed, 269 insertions(+), 4 deletions(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java index 45de6f8c..c2db2689 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java @@ -543,7 +543,7 @@ public interface WxMpService { void setMaxRetryTimes(int maxRetryTimes); /** - * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/index.php?chapter=9_1) + * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识" * @param openId 支付人openId * @param outTradeNo 商户端对应订单号 @@ -570,4 +570,11 @@ public interface WxMpService { */ Map getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String notifyUrl); + /** + * 该接口提供所有微信支付订单的查询,当支付通知处理异常戒丢失的情冴,商户可以通过该接口查询订单支付状态。 + * 详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_2 + * @param transactionId + * @param outTradeNo + */ + WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java index fcad2d86..c676570a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java @@ -705,4 +705,48 @@ public class WxMpServiceImpl implements WxMpService { payInfo.put("sign", finalSign); return payInfo; } + + @Override + public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) { + String nonce_str = System.currentTimeMillis() + ""; + + SortedMap packageParams = new TreeMap(); + packageParams.put("appid", wxMpConfigStorage.getAppId()); + packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); + packageParams.put("transaction_id", transactionId); + packageParams.put("out_trade_no", outTradeNo); + packageParams.put("nonce_str", nonce_str); + + String sign = WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey()); + String xml = "" + + "" + wxMpConfigStorage.getAppId() + "" + + "" + wxMpConfigStorage.getPartnerId() + "" + + "" + transactionId + "" + + "" + outTradeNo + "" + + "" + nonce_str + "" + + "" + sign + "" + + ""; + + HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery"); + if (httpProxy != null) { + RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); + httpPost.setConfig(config); + } + + StringEntity entity = new StringEntity(xml, Consts.UTF_8); + httpPost.setEntity(entity); + try { + CloseableHttpResponse response = httpClient.execute(httpPost); + String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); + XStream xstream = XStreamInitializer.getInstance(); + xstream.alias("xml", WxMpPayResult.class); + WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent); + return wxMpPayResult; + } catch (IOException e) { + e.printStackTrace(); + } + return new WxMpPayResult(); + } + + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java new file mode 100644 index 00000000..7fd850fb --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java @@ -0,0 +1,215 @@ +package me.chanjar.weixin.mp.bean.result; + +import java.io.Serializable; + +/** + *
+ * 查询订单支付状态返回的结果
+ * 
+ * 查询订单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_2)
+ *
+ * 
+ * + * @author ukid + */ +public class WxMpPayResult implements Serializable { + private String return_code; + private String return_msg; + private String appid; + private String mch_id; + private String nonce_str; + private String sign; + private String result_code; + private String err_code; + private String err_code_des; + private String trade_state; + private String device_info; + private String openid; + private String is_subscribe; + private String trade_type; + private String bank_type; + 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() { + return return_code; + } + + public String getReturn_msg() { + return return_msg; + } + + public String getAppid() { + return appid; + } + + public String getMch_id() { + return mch_id; + } + + public String getNonce_str() { + return nonce_str; + } + + public String getSign() { + return sign; + } + + public String getResult_code() { + return result_code; + } + + public String getErr_code() { + return err_code; + } + + public String getErr_code_des() { + return err_code_des; + } + + public String getTrade_state() { + return trade_state; + } + + public String getDevice_info() { + return device_info; + } + + public String getOpenid() { + return openid; + } + + public String getIs_subscribe() { + return is_subscribe; + } + + public String getTrade_type() { + return trade_type; + } + + public String getBank_type() { + return bank_type; + } + + public String getTotal_fee() { + return total_fee; + } + + public String getCoupon_fee() { + return coupon_fee; + } + + public String getFee_type() { + return fee_type; + } + + public String getTransaction_id() { + return transaction_id; + } + + public String getOut_trade_no() { + return out_trade_no; + } + + public String getAttach() { + return attach; + } + + public String getTime_end() { + return time_end; + } + + public void setReturn_code(String return_code) { + this.return_code = return_code; + } + + public void setReturn_msg(String return_msg) { + this.return_msg = return_msg; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public void setMch_id(String mch_id) { + this.mch_id = mch_id; + } + + public void setNonce_str(String nonce_str) { + this.nonce_str = nonce_str; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public void setResult_code(String result_code) { + this.result_code = result_code; + } + + public void setErr_code(String err_code) { + this.err_code = err_code; + } + + public void setErr_code_des(String err_code_des) { + this.err_code_des = err_code_des; + } + + public void setTrade_state(String trade_state) { + this.trade_state = trade_state; + } + + public void setDevice_info(String device_info) { + this.device_info = device_info; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public void setIs_subscribe(String is_subscribe) { + this.is_subscribe = is_subscribe; + } + + public void setTrade_type(String trade_type) { + this.trade_type = trade_type; + } + + public void setBank_type(String bank_type) { + this.bank_type = bank_type; + } + + public void setTotal_fee(String total_fee) { + this.total_fee = total_fee; + } + + public void setCoupon_fee(String coupon_fee) { + this.coupon_fee = coupon_fee; + } + + public void setFee_type(String fee_type) { + this.fee_type = fee_type; + } + + public void setTransaction_id(String transaction_id) { + this.transaction_id = transaction_id; + } + + public void setOut_trade_no(String out_trade_no) { + this.out_trade_no = out_trade_no; + } + + public void setAttach(String attach) { + this.attach = attach; + } + + public void setTime_end(String time_end) { + this.time_end = time_end; + } + +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java index 25286168..aa42299a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java @@ -4,10 +4,9 @@ import java.io.Serializable; /** *
- * 群发消息一发送就返回的结果
+ * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识"返回的结果
  *
- * 真正的群发消息是否发送成功要看
- * http://mp.weixin.qq.com/wiki/index.php?title=高级群发接口#.E4.BA.8B.E4.BB.B6.E6.8E.A8.E9.80.81.E7.BE.A4.E5.8F.91.E7.BB.93.E6.9E.9C
+ * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
  *
  * 
* From 8eb028ffb431b8612e8fe1fb8cfed4049ab9da63 Mon Sep 17 00:00:00 2001 From: ukid Date: Fri, 22 May 2015 11:20:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E5=86=85=E5=AE=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/WxMpService.java | 8 + .../weixin/mp/api/WxMpServiceImpl.java | 13 + .../mp/bean/result/WxMpPayCallback.java | 260 ++++++++++++++++++ 3 files changed, 281 insertions(+) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java index c2db2689..29f1a46f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java @@ -577,4 +577,12 @@ public interface WxMpService { * @param outTradeNo */ WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo); + + /** + * 读取支付结果通知 + * 详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7 + * @param xmlData + * @return + */ + WxMpPayCallback getJSSDKCallbackData(String xmlData); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java index c676570a..75b6d31b 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpServiceImpl.java @@ -747,6 +747,19 @@ public class WxMpServiceImpl implements WxMpService { } return new WxMpPayResult(); } + + @Override + public WxMpPayCallback getJSSDKCallbackData(String xmlData) { + try { + XStream xstream = XStreamInitializer.getInstance(); + xstream.alias("xml", WxMpPayResult.class); + WxMpPayCallback wxMpCallback = (WxMpPayCallback) xstream.fromXML(xmlData); + return wxMpCallback; + } catch (Exception e){ + e.printStackTrace(); + } + return new WxMpPayCallback(); + } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java new file mode 100644 index 00000000..a65603c4 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java @@ -0,0 +1,260 @@ +package me.chanjar.weixin.mp.bean.result; + +import java.io.Serializable; + +/** + * pre> 订单支付状态回调 + * + * 支付结果通知(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7) + * + * /pre> + * + * @author ukid + */ +public class WxMpPayCallback implements Serializable { + private String return_code; + private String return_msg; + + private String appid; + private String mch_id; + private String device_info; + private String nonce_str; + private String sign; + private String result_code; + private String err_code; + private String err_code_des; + private String openid; + private String is_subscribe; + private String trade_type; + private String bank_type; + private String total_fee; + private String fee_type; + private String cash_fee; + private String cash_fee_type; + private String coupon_fee; + private String coupon_count; + private String coupon_batch_id_$n; + private String coupon_id_$n; + private String coupon_fee_$n; + private String transaction_id; + private String out_trade_no; + private String attach; + private String time_end; + + public String getReturn_code() { + return return_code; + } + + public String getReturn_msg() { + return return_msg; + } + + public String getAppid() { + return appid; + } + + public String getMch_id() { + return mch_id; + } + + public String getDevice_info() { + return device_info; + } + + public String getNonce_str() { + return nonce_str; + } + + public String getSign() { + return sign; + } + + public String getResult_code() { + return result_code; + } + + public String getErr_code() { + return err_code; + } + + public String getErr_code_des() { + return err_code_des; + } + + public String getOpenid() { + return openid; + } + + public String getIs_subscribe() { + return is_subscribe; + } + + public String getTrade_type() { + return trade_type; + } + + public String getBank_type() { + return bank_type; + } + + public String getTotal_fee() { + return total_fee; + } + + public String getFee_type() { + return fee_type; + } + + public String getCash_fee() { + return cash_fee; + } + + public String getCash_fee_type() { + return cash_fee_type; + } + + public String getCoupon_fee() { + return coupon_fee; + } + + public String getCoupon_count() { + return coupon_count; + } + + public String getCoupon_batch_id_$n() { + return coupon_batch_id_$n; + } + + public String getCoupon_id_$n() { + return coupon_id_$n; + } + + public String getCoupon_fee_$n() { + return coupon_fee_$n; + } + + public String getTransaction_id() { + return transaction_id; + } + + public String getOut_trade_no() { + return out_trade_no; + } + + public String getAttach() { + return attach; + } + + public String getTime_end() { + return time_end; + } + + public void setReturn_code(String return_code) { + this.return_code = return_code; + } + + public void setReturn_msg(String return_msg) { + this.return_msg = return_msg; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public void setMch_id(String mch_id) { + this.mch_id = mch_id; + } + + public void setDevice_info(String device_info) { + this.device_info = device_info; + } + + public void setNonce_str(String nonce_str) { + this.nonce_str = nonce_str; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public void setResult_code(String result_code) { + this.result_code = result_code; + } + + public void setErr_code(String err_code) { + this.err_code = err_code; + } + + public void setErr_code_des(String err_code_des) { + this.err_code_des = err_code_des; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + public void setIs_subscribe(String is_subscribe) { + this.is_subscribe = is_subscribe; + } + + public void setTrade_type(String trade_type) { + this.trade_type = trade_type; + } + + public void setBank_type(String bank_type) { + this.bank_type = bank_type; + } + + public void setTotal_fee(String total_fee) { + this.total_fee = total_fee; + } + + public void setFee_type(String fee_type) { + this.fee_type = fee_type; + } + + public void setCash_fee(String cash_fee) { + this.cash_fee = cash_fee; + } + + public void setCash_fee_type(String cash_fee_type) { + this.cash_fee_type = cash_fee_type; + } + + public void setCoupon_fee(String coupon_fee) { + this.coupon_fee = coupon_fee; + } + + public void setCoupon_count(String coupon_count) { + this.coupon_count = coupon_count; + } + + public void setCoupon_batch_id_$n(String coupon_batch_id_$n) { + this.coupon_batch_id_$n = coupon_batch_id_$n; + } + + public void setCoupon_id_$n(String coupon_id_$n) { + this.coupon_id_$n = coupon_id_$n; + } + + public void setCoupon_fee_$n(String coupon_fee_$n) { + this.coupon_fee_$n = coupon_fee_$n; + } + + public void setTransaction_id(String transaction_id) { + this.transaction_id = transaction_id; + } + + public void setOut_trade_no(String out_trade_no) { + this.out_trade_no = out_trade_no; + } + + public void setAttach(String attach) { + this.attach = attach; + } + + public void setTime_end(String time_end) { + this.time_end = time_end; + } + +}