增加查询红包记录的接口 for #73

binarywang · binarywang · Nov 30, 2016 · Nov 1, 2016 · Nov 1, 2016 · Nov 1, 2016
commit 9d06a696d0b9feca775f516e78044660bc276766
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java
@@ -121,14 +121,29 @@ public interface WxMpPayService {
    * <pre>
    * 文档详见:
    * 发送普通红包 https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_4&index=3
+   *  接口地址：https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack
    * 发送裂变红包 https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_5&index=4
+   *  接口地址：https://api.mch.weixin.qq.com/mmpaymkttransfers/sendgroupredpack
    * </pre>
    *
    * @param request 请求对象
    * @param keyFile 证书文件对象
    */
   WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request, File keyFile) throws WxErrorException;
 
+  /**
+   * <pre>
+   *   查询红包记录
+   *   用于商户对已发放的红包进行查询红包的具体信息，可支持普通红包和裂变包。
+   *   请求Url	https://api.mch.weixin.qq.com/mmpaymkttransfers/gethbinfo
+   *   是否需要证书	是（证书及使用说明详见商户证书）
+   *   请求方式	POST
+   * </pre>
+   * @param mchBillNo 商户发放红包的商户订单号，比如10000098201411111234567890
+   * @param keyFile 证书文件对象
+   */
+  WxPayRedpackQueryResult queryRedpack(String mchBillNo, File keyFile) throws WxErrorException;
+
   /**
    * <pre>
    * 企业付款业务是基于微信支付商户平台的资金管理能力，为了协助商户方便地实现企业向个人付款，针对部分有开发能力的商户，提供通过API完成企业付款的功能。

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java
@@ -183,6 +183,32 @@ public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request, File
     return result;
   }
 
+  @Override
+  public WxPayRedpackQueryResult queryRedpack(String mchBillNo, File keyFile) throws WxErrorException {
+    XStream xstream = XStreamInitializer.getInstance();
+    xstream.processAnnotations(WxPayRedpackQueryRequest.class);
+    xstream.processAnnotations(WxPayRedpackQueryResult.class);
+
+    WxPayRedpackQueryRequest request = new WxPayRedpackQueryRequest();
+    request.setMchBillNo(mchBillNo);
+    request.setBillType("MCHT");
+
+    request.setAppid(this.wxMpService.getWxMpConfigStorage().getAppId());
+    String mchId = this.wxMpService.getWxMpConfigStorage().getPartnerId();
+    request.setMchId(mchId);
+    request.setNonceStr(System.currentTimeMillis() + "");
+
+    String sign = this.createSign(BeanUtils.xmlBean2Map(request),
+      this.wxMpService.getWxMpConfigStorage().getPartnerKey());
+    request.setSign(sign);
+
+    String url = PAY_BASE_URL + "/mmpaymkttransfers/gethbinfo";
+    String responseContent = this.executeRequestWithKeyFile(url, keyFile, xstream.toXML(request), mchId);
+    WxPayRedpackQueryResult result = (WxPayRedpackQueryResult) xstream.fromXML(responseContent);
+    this.checkResult(result);
+    return result;
+  }
+
   /**
    * 微信公众号支付签名算法(详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=4_3)
    *

diff --git a/...java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayRedpackQueryRequest.java b/...java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayRedpackQueryRequest.java
@@ -0,0 +1,57 @@
+package me.chanjar.weixin.mp.bean.pay.request;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+/**
+ * <pre>
+ *   注释中各行对应含义：
+ *   字段名
+ *   字段
+ *   必填
+ *   示例值
+ *   类型
+ *   说明
+ * Created by Binary Wang on 2016-11-28.
+ * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
+ * </pre>
+ */
+@XStreamAlias("xml")
+public class WxPayRedpackQueryRequest extends WxPayBaseRequest {
+  /**
+   * 商户订单号
+   * mch_billno
+   * 是
+   * 10000098201411111234567890
+   * String(28)
+   * 商户发放红包的商户订单号
   */
+  @XStreamAlias("mch_billno")
+  private String mchBillNo;
+
+  /**
+   * 订单类型
+   * bill_type
+   * 是
+   * MCHT
+   * String(32)
+   * MCHT:通过商户订单号获取红包信息。
+   */
+  @XStreamAlias("bill_type")
+  private String billType;
+
+  public String getBillType() {
+    return billType;
+  }
+
+  public void setBillType(String billType) {
+    this.billType = billType;
+  }
+
+  public String getMchBillNo() {
+    return mchBillNo;
+  }
+
+  public void setMchBillNo(String mchBillNo) {
+    this.mchBillNo = mchBillNo;
+  }
+}
diff --git a/...-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPaySendRedpackRequest.java b/...-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPaySendRedpackRequest.java
@@ -14,7 +14,7 @@ public class WxPaySendRedpackRequest {
      * 商户订单号（每个订单号必须唯一）  组成：mch_id+yyyymmdd+10位一天内不能重复的数字。  接口根据商户订单号支持重入，如出现超时可再调用。
   */
   @XStreamAlias("mch_billno")
-  private String mchBillno;
+  private String mchBillNo;
 
   /**
    * send_name
@@ -157,12 +157,12 @@ public class WxPaySendRedpackRequest {
   @XStreamAlias("consume_mch_id")
   private String consumeMchId;
 
-  public String getMchBillno() {
-    return this.mchBillno;
+  public String getMchBillNo() {
+    return mchBillNo;
   }
 
-  public void setMchBillno(String mchBillno) {
-    this.mchBillno = mchBillno;
+  public void setMchBillNo(String mchBillNo) {
+    this.mchBillNo = mchBillNo;
   }
 
   public String getSendName() {

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderQueryResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderQueryResult.java
@@ -1,10 +1,10 @@
 package me.chanjar.weixin.mp.bean.pay.result;
 
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
+import java.util.List;
+
 /**
  * <pre>
  *  查询订单 返回结果对象