cardList;
+
+ /**
+ * 该商户名下卡券ID总数
+ */
+ @SerializedName("total_num")
+ private Integer totalNum;
+
+ @Override
+ public String toString() {
+ return WxMpGsonBuilder.create().toJson(this);
+ }
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
index f6b54a20..5c3356e0 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
@@ -576,6 +576,12 @@ public class WxMpXmlMessage implements Serializable {
@XStreamAlias("Reason")
private String reason;
+ /**
+ * 审核失败的小程序截图示例.
+ */
+ @XStreamAlias("ScreenShot")
+ private String screenShot;
+
///////////////////////////////////////
// 扫一扫事件推送
///////////////////////////////////////
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java
index 9bc0e1de..c62c6c92 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java
@@ -516,6 +516,10 @@ public interface WxMpApiUrl {
* get.
*/
CARD_GET(API_DEFAULT_HOST_URL, "/card/get"),
+ /**
+ * batch get
+ */
+ CARD_BATCHGET(API_DEFAULT_HOST_URL, "/card/batchget"),
/**
* wx_card.
*/
@@ -528,6 +532,10 @@ public interface WxMpApiUrl {
* get.
*/
CARD_CODE_GET(API_DEFAULT_HOST_URL, "/card/code/get"),
+ /**
+ * get card list
+ */
+ CARD_USER_GETCARDLIST(API_DEFAULT_HOST_URL, "/card/user/getcardlist"),
/**
* consume.
*/
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index b03d8b33..d99bc7d2 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
com.github.binarywang
wx-java
- 3.8.0
+ 3.8.0.A
weixin-java-open
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/WxOpenCreateResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/WxOpenCreateResult.java
index 6e06a16d..85f67de0 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/WxOpenCreateResult.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/WxOpenCreateResult.java
@@ -5,6 +5,7 @@ import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+import me.chanjar.weixin.open.bean.result.WxOpenResult;
import java.io.Serializable;
@@ -17,18 +18,12 @@ import java.io.Serializable;
* @author Binary Wang
*/
@Data
-@EqualsAndHashCode(callSuper = false)
-public class WxOpenCreateResult implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public class WxOpenCreateResult extends WxOpenResult {
@SerializedName("open_appid")
private String openAppid;
- @SerializedName("errcode")
- private String errcode;
-
- @SerializedName("errmsg")
- private String errmsg;
-
public static WxOpenCreateResult fromJson(String json) {
return WxGsonBuilder.create().fromJson(json, WxOpenCreateResult.class);
}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxOpenAuthorizer.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxOpenAuthorizer.java
new file mode 100644
index 00000000..7f98c100
--- /dev/null
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/ma/WxOpenAuthorizer.java
@@ -0,0 +1,27 @@
+package me.chanjar.weixin.open.bean.ma;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NonNull;
+
+import java.io.Serializable;
+
+/**
+ * 微信开放平台小程序成员对象
+ *
+ * @author Stormeye
+ * @date 2019/04/26
+ */
+@Data
+public class WxOpenAuthorizer implements Serializable {
+
+ @NonNull
+ @SerializedName("authorizer_appid")
+ private String authorizerAppid;
+
+ @SerializedName("refresh_token")
+ private String refreshToken;
+
+ @SerializedName("auth_time")
+ private Long authTime;
+}
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index ba61c037..a5087080 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
com.github.binarywang
wx-java
- 3.8.0
+ 3.8.0.A
4.0.0
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderCloseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderCloseRequest.java
index 3758653a..35e42c8a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderCloseRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderCloseRequest.java
@@ -21,6 +21,19 @@ import java.util.Map;
@XStreamAlias("xml")
public class WxPayOrderCloseRequest extends BaseWxPayRequest {
+ /**
+ *
+ * 微信订单号
+ * transaction_id
+ * 二选一
+ * String(32)
+ * 20150806125346
+ * 微信的订单号,优先使用。
+ *
+ */
+ @XStreamAlias("transaction_id")
+ private String transactionId;
+
/**
*
* 商户订单号
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java
index b7de7ffe..b4630d30 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayMicropayResult.java
@@ -49,7 +49,33 @@ public class WxPayMicropayResult extends BaseWxPayResult {
/**
*
- * 交易类型.
+ * 用户子标识
+ * openid
+ * 是
+ * String(128)
+ * Y
+ * 用户在商户appid 下的唯一标识
+ *
+ **/
+ @XStreamAlias("sub_openid")
+ private String subOpenid;
+
+ /**
+ *
+ * 是否关注子公众账号
+ * sub_is_subscribe
+ * 是
+ * String(1)
+ * Y
+ * 用户是否关注公众账号,仅在公众账号类型支付有效,取值范围:Y或N;Y-关注;N-未关注
+ *
+ **/
+ @XStreamAlias("sub_is_subscribe")
+ private String subIsSubscribe;
+
+ /**
+ *
+ * 交易类型
* trade_type
* 是
* String(16)