From 905f09808d30323844bc5988662d5eac2442933e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E9=98=B3?= Date: Wed, 24 Jan 2018 16:46:25 +0800 Subject: [PATCH] =?UTF-8?q?#443=20=E5=9C=A8=E8=8E=B7=E5=8F=96=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E5=8D=A1=E4=BF=A1=E6=81=AF=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?balance=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=B6=89=E5=8F=8A=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E7=9A=84balance=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BAdo?= =?UTF-8?q?uble=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 在获取会员卡信息中增加balance字段,涉及金额的balance字段改为double类型 * 同步 修改 GsonAdapter 中相关字段 --- .../mp/bean/membercard/WxMpMemberCardActivatedMessage.java | 2 +- .../mp/bean/membercard/WxMpMemberCardUpdateMessage.java | 4 ++-- .../weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java | 2 +- .../mp/bean/membercard/WxMpMemberCardUserInfoResult.java | 2 ++ .../mp/util/json/WxMpMemberCardUpdateResultGsonAdapter.java | 2 +- .../mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java | 1 + 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java index d9232844..9b1ac647 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java @@ -58,7 +58,7 @@ public class WxMpMemberCardActivatedMessage implements Serializable { * 初始余额,不填为0。 */ @SerializedName("init_balance") - private Integer initBalance; + private Double initBalance; /** * 创建时字段custom_field1定义类型的初始值,限制为4个汉字,12字节。 */ diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java index f666e655..d4323e09 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java @@ -52,12 +52,12 @@ public class WxMpMemberCardUpdateMessage implements Serializable { /** * 需要设置的余额全量值,传入的数值会直接显示在卡面 */ - private Integer balance; + private Double balance; /** * 本次余额变动值,传负数代表减少 */ @SerializedName("add_balance") - private Integer addBalance; + private Double addBalance; /** * 商家自定义金额消耗记录,不超过14个汉字。 */ diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java index 7ceac8e8..355b67df 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java @@ -28,7 +28,7 @@ public class WxMpMemberCardUpdateResult implements Serializable { private Integer resultBonus; - private Integer resultBalance; + private Double resultBalance; @Override public String toString() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java index a0ad47f3..d87f4ba3 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java @@ -33,6 +33,8 @@ public class WxMpMemberCardUserInfoResult implements Serializable { private Integer bonus; + private Double balance; + private String sex; private MemberCardUserInfo userInfo; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUpdateResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUpdateResultGsonAdapter.java index dc068db1..0d459463 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUpdateResultGsonAdapter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUpdateResultGsonAdapter.java @@ -29,7 +29,7 @@ public class WxMpMemberCardUpdateResultGsonAdapter implements JsonDeserializer