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..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
@@ -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="
@@ -314,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;
@@ -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;
+ }
+
/**
* 返回卡券的基础信息
*
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;
}
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;
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();