diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CashCard.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CashCard.java index 3d4de40c..df5290b2 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CashCard.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CashCard.java @@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.card; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.io.Serializable; @@ -12,8 +13,8 @@ import java.io.Serializable; * @Date 2018/12/29 */ @Data +@EqualsAndHashCode(callSuper = true) public final class CashCard extends Card implements Serializable { - private static final long serialVersionUID = 6965491956462769745L; /** diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/DiscountCard.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/DiscountCard.java index b2c3a13f..b1becbd6 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/DiscountCard.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/DiscountCard.java @@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.card; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.io.Serializable; @@ -12,8 +13,8 @@ import java.io.Serializable; * @Date 2018/12/29 */ @Data +@EqualsAndHashCode(callSuper = true) public final class DiscountCard extends Card implements Serializable { - private static final long serialVersionUID = 1704610082472315077L; /** diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/DiscountCardCreateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/DiscountCardCreateRequest.java index 869c487c..b527ec12 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/DiscountCardCreateRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/DiscountCardCreateRequest.java @@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.card; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.io.Serializable; @@ -12,7 +13,10 @@ import java.io.Serializable; * @Date 2018/12/29 */ @Data +@EqualsAndHashCode(callSuper = true) public class DiscountCardCreateRequest extends CardCreateRequest implements Serializable { + private static final long serialVersionUID = 1190518086576489692L; + @SerializedName("card_type") private String cardType = "DISCOUNT"; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCard.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCard.java index dcfba74d..2264d8ec 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCard.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCard.java @@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.card; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.io.Serializable; @@ -12,8 +13,8 @@ import java.io.Serializable; * @Date 2018/12/29 */ @Data +@EqualsAndHashCode(callSuper = true) public final class GeneralCard extends Card implements Serializable { - private static final long serialVersionUID = -1577656733441132585L; /** diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCardCreateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCardCreateRequest.java index 8a9c3d18..f1ac5698 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCardCreateRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCardCreateRequest.java @@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.card; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.io.Serializable; @@ -12,7 +13,10 @@ import java.io.Serializable; * @Date 2018/12/29 */ @Data +@EqualsAndHashCode(callSuper = true) public class GeneralCardCreateRequest extends CardCreateRequest implements Serializable { + private static final long serialVersionUID = 1771355872211267723L; + @SerializedName("card_type") private String cardType = "GENERAL_COUPON"; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GrouponCardCreateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GrouponCardCreateRequest.java index 48b1e3e7..aeab1fd3 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GrouponCardCreateRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GrouponCardCreateRequest.java @@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.bean.card; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.io.Serializable; @@ -12,7 +13,10 @@ import java.io.Serializable; * @Date 2018/12/29 */ @Data +@EqualsAndHashCode(callSuper = true) public class GrouponCardCreateRequest extends CardCreateRequest implements Serializable { + private static final long serialVersionUID = 7551441058859934512L; + @SerializedName("card_type") private String cardType = "GROUPON";