diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayBaseInfo.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayBaseInfo.java index 7ea9f9f0..4a6af1ad 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayBaseInfo.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayBaseInfo.java @@ -28,31 +28,31 @@ public class PayBaseInfo implements Serializable { /** * 公众号ID */ - @JSONField(name = "AppId") + @JSONField(name = "appId") @XmlElement(name = "AppId") private String appId; /** * 时间戳 */ - @JSONField(name = "TimeStamp") + @JSONField(name = "timeStamp") @XmlElement(name = "TimeStamp") private String timeStamp; /** * 随机字符串 */ - @JSONField(name = "NonceStr") + @JSONField(name = "nonceStr") @XmlElement(name = "NonceStr") private String nonceStr; /** * 签名结果 */ - @JSONField(name = "AppSignature") + @JSONField(name = "paySign") @XmlElement(name = "AppSignature") private String paySign; /** * 签名方式 */ - @JSONField(name = "SignMethod") + @JSONField(name = "signType") @XmlElement(name = "SignMethod") private String signType; diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java index 9a642993..d28c6e88 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java @@ -19,7 +19,7 @@ public enum TradeType { */ MICROPAY, /** - * 扫描支付 + * 扫码支付 */ NATIVE, /** diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/User.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/User.java index 126c06f5..c01a3eb0 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/User.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/User.java @@ -3,6 +3,7 @@ package com.foxinmy.weixin4j.mp.model; import java.io.Serializable; import java.util.Date; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.annotation.JSONField; import com.foxinmy.weixin4j.model.Gender; import com.foxinmy.weixin4j.mp.type.FaceSize; @@ -57,7 +58,7 @@ public class User implements Serializable { /** * 用户特权信息,json 数组,如微信沃卡用户为(chinaunicom) */ - private String privilege; + private JSONArray privilege; /** * 用户是否订阅该公众号标识,值为0时,代表此用户没有关注该公众号,拉取不到其余信息。 */ @@ -163,11 +164,11 @@ public class User implements Serializable { this.headimgurl = headimgurl; } - public String getPrivilege() { + public JSONArray getPrivilege() { return privilege; } - public void setPrivilege(String privilege) { + public void setPrivilege(JSONArray privilege) { this.privilege = privilege; } @@ -237,7 +238,13 @@ public class User implements Serializable { @Override public boolean equals(Object obj) { if (obj instanceof User) { - return openId.equals(((User) obj).getOpenId()); + User another = (User) obj; + if (unionId != null && another.getUnionId() != null) { + return unionId.equals(another.getUnionId()); + } + if (openId != null && another.getOpenId() != null) { + return openId.equals(another.getOpenId()); + } } return false; }