From 570b012c4c63757bbbf7279fab083f47bd214359 Mon Sep 17 00:00:00 2001 From: fengyapeng Date: Wed, 4 Jan 2017 19:06:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96Stream=20close=20?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/foxinmy/weixin4j/util/IOUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/IOUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/IOUtil.java index 6651f62f..74240485 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/IOUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/IOUtil.java @@ -87,6 +87,9 @@ public class IOUtil { public static void close(Closeable stream) { try { + if(stream == null){ + return ; + } stream.close(); } catch (IOException e) { e.printStackTrace(); From 0dec5c1c0f498fabd01507fcc9f6483a7dacbe93 Mon Sep 17 00:00:00 2001 From: fengyapeng Date: Sat, 7 Jan 2017 16:42:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0needPushOnView=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin4j/model/card/CouponBaseInfo.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/CouponBaseInfo.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/CouponBaseInfo.java index 44ef5cda..5655bc5b 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/CouponBaseInfo.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/CouponBaseInfo.java @@ -155,6 +155,9 @@ public class CouponBaseInfo implements Serializable { @JSONField(name = "can_give_friend") private boolean canGiveFriend; + @JSONField(name = "need_push_on_view") + private Boolean needPushOnView; + private CouponBaseInfo(Builder builder) { this.logoUrl = builder.logoUrl; this.brandName = builder.brandName; @@ -183,6 +186,7 @@ public class CouponBaseInfo implements Serializable { this.limitNum = builder.limitNum; this.canShare = builder.canShare; this.canGiveFriend = builder.canGiveFriend; + this.needPushOnView = builder.needPushOnView; }; public String getLogoUrl() { @@ -293,6 +297,10 @@ public class CouponBaseInfo implements Serializable { return canGiveFriend; } + public Boolean getNeedPushOnView() { + return needPushOnView; + } + @Override public String toString() { return "logoUrl=" + logoUrl + ", brandName=" + brandName + ", title=" @@ -440,6 +448,11 @@ public class CouponBaseInfo implements Serializable { */ private boolean canGiveFriend; + /** + * 用户点击进入卡券时推送事件 + */ + private boolean needPushOnView; + /** * 默认永久有效 */ @@ -811,6 +824,11 @@ public class CouponBaseInfo implements Serializable { return this; } + public Builder needPushOnView(boolean needPushOnView){ + this.needPushOnView = needPushOnView; + return this; + } + /** * 返回卡券的基础信息 * From 25e7eb91d71ccd6f94233361931e80e888855f1f Mon Sep 17 00:00:00 2001 From: fengyapeng Date: Thu, 12 Jan 2017 16:37:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8D=A1=E7=9A=84bug~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/foxinmy/weixin4j/model/card/CouponBaseInfo.java | 2 +- .../java/com/foxinmy/weixin4j/model/card/MemberUserForm.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/CouponBaseInfo.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/CouponBaseInfo.java index 5655bc5b..8b4bf1f4 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/CouponBaseInfo.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/CouponBaseInfo.java @@ -322,7 +322,7 @@ public class CouponBaseInfo implements Serializable { public void cleanCantUpdateField() { this.brandName = null; - this.title = null; +// this.title = null; this.sku = null; this.bindOpenId = null; this.useCustomCode = null; diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/MemberUserForm.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/MemberUserForm.java index efdb31be..f29dbfb7 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/MemberUserForm.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/card/MemberUserForm.java @@ -135,7 +135,7 @@ public class MemberUserForm { } public FormBudiler canModify(boolean modify){ - this.canModify = canModify; + this.canModify = modify; return this; } From f9b4d816bde531e42001bd840dbe16b39af17d7a Mon Sep 17 00:00:00 2001 From: fengyapeng Date: Mon, 16 Jan 2017 14:26:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8D=A1=E5=88=B8=20colo?= =?UTF-8?q?r=20=E7=9A=84=E9=A2=9C=E8=89=B2=E8=B6=85=E8=BF=87100=20?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E7=9A=84=20=E6=9E=9A=E4=B8=BE=E5=80=BC?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/foxinmy/weixin4j/type/card/CardColor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/card/CardColor.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/card/CardColor.java index 3ba5f189..ad4d4f93 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/card/CardColor.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/card/CardColor.java @@ -57,15 +57,15 @@ public enum CardColor { /** * Color0100 */ - Color0100(204, 70, 61, "#cc463d"), + Color100(204, 70, 61, "#cc463d"), /** * Color0101 */ - Color0101(207, 62, 54, "#cf3e36"), + Color101(207, 62, 54, "#cf3e36"), /** * Color0102 */ - Color0102(94, 102, 113, "#5E6671"); + Color102(94, 102, 113, "#5E6671"); private int r; private int g; private int b;