diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java index 579ae3463..07572bb50 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java @@ -2,11 +2,11 @@ package me.chanjar.weixin.mp.api; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.bean.card.CardUpdateResult; -import me.chanjar.weixin.mp.bean.card.MemberCardActivateUserFormRequest; -import me.chanjar.weixin.mp.bean.card.MemberCardActivateUserFormResult; -import me.chanjar.weixin.mp.bean.card.MemberCardUpdateRequest; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCardActivateUserFormRequest; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCardActivateUserFormResult; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCardUpdateRequest; import me.chanjar.weixin.mp.bean.card.WxMpCardCreateResult; -import me.chanjar.weixin.mp.bean.membercard.*; +import me.chanjar.weixin.mp.bean.card.membercard.*; /** * 会员卡相关接口. diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java index dc70a7b9d..4f4471b2b 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; import lombok.RequiredArgsConstructor; -import me.chanjar.weixin.mp.bean.membercard.*; +import me.chanjar.weixin.mp.bean.card.membercard.*; import me.chanjar.weixin.mp.enums.WxMpApiUrl; import org.apache.commons.lang3.StringUtils; @@ -24,11 +24,11 @@ import me.chanjar.weixin.mp.bean.card.AdvancedInfo; import me.chanjar.weixin.mp.bean.card.BaseInfo; import me.chanjar.weixin.mp.bean.card.CardUpdateResult; import me.chanjar.weixin.mp.bean.card.DateInfo; -import me.chanjar.weixin.mp.bean.card.MemberCard; -import me.chanjar.weixin.mp.bean.card.MemberCardActivateUserFormRequest; -import me.chanjar.weixin.mp.bean.card.MemberCardActivateUserFormResult; -import me.chanjar.weixin.mp.bean.card.MemberCardCreateRequest; -import me.chanjar.weixin.mp.bean.card.MemberCardUpdateRequest; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCard; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCardActivateUserFormRequest; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCardActivateUserFormResult; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCardCreateRequest; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCardUpdateRequest; import me.chanjar.weixin.mp.bean.card.WxMpCardCreateResult; import me.chanjar.weixin.mp.bean.card.enums.BusinessServiceType; import me.chanjar.weixin.mp.bean.card.enums.CardColor; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/ActivatePluginParam.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/ActivatePluginParam.java similarity index 85% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/ActivatePluginParam.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/ActivatePluginParam.java index 526ff5cc0..1ce8ef128 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/ActivatePluginParam.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/ActivatePluginParam.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/ActivatePluginParamResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/ActivatePluginParamResult.java similarity index 78% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/ActivatePluginParamResult.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/ActivatePluginParamResult.java index 4f060557d..8e7be799a 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/ActivatePluginParamResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/ActivatePluginParamResult.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import lombok.Data; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCard.java similarity index 98% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCard.java index 76d7f2175..5d23f5edb 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCard.java @@ -1,9 +1,10 @@ -package me.chanjar.weixin.mp.bean.card; +package me.chanjar.weixin.mp.bean.card.membercard; import java.io.Serializable; import com.google.gson.annotations.SerializedName; import lombok.Data; +import me.chanjar.weixin.mp.bean.card.*; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; /** diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardActivateUserFormRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardActivateUserFormRequest.java similarity index 91% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardActivateUserFormRequest.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardActivateUserFormRequest.java index 3d9a96876..8dd758c37 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardActivateUserFormRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardActivateUserFormRequest.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.card; +package me.chanjar.weixin.mp.bean.card.membercard; import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; @@ -46,8 +46,9 @@ public class MemberCardActivateUserFormRequest implements Serializable { if (StringUtils.isAnyEmpty(name, url)) { return; } - if (bindOldCard == null) + if (bindOldCard == null) { bindOldCard = new JsonObject(); + } bindOldCard.addProperty("name", name); bindOldCard.addProperty("url", url); } @@ -62,8 +63,9 @@ public class MemberCardActivateUserFormRequest implements Serializable { if (StringUtils.isAnyEmpty(name, url)) { return; } - if (serviceStatement == null) + if (serviceStatement == null) { serviceStatement = new JsonObject(); + } serviceStatement.addProperty("name", name); serviceStatement.addProperty("url", url); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardActivateUserFormResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardActivateUserFormResult.java similarity index 91% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardActivateUserFormResult.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardActivateUserFormResult.java index 381feda14..8346770bf 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardActivateUserFormResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardActivateUserFormResult.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.card; +package me.chanjar.weixin.mp.bean.card.membercard; import java.io.Serializable; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardCreateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardCreateRequest.java similarity index 92% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardCreateRequest.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardCreateRequest.java index 5abdf7331..9fb94e9ff 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardCreateRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardCreateRequest.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.card; +package me.chanjar.weixin.mp.bean.card.membercard; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUpdate.java similarity index 93% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUpdate.java index 00333117a..7220de7e5 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUpdate.java @@ -1,7 +1,11 @@ -package me.chanjar.weixin.mp.bean.card; +package me.chanjar.weixin.mp.bean.card.membercard; import com.google.gson.annotations.SerializedName; import lombok.Data; +import me.chanjar.weixin.mp.bean.card.BaseInfoUpdate; +import me.chanjar.weixin.mp.bean.card.BonusRule; +import me.chanjar.weixin.mp.bean.card.CustomCell1; +import me.chanjar.weixin.mp.bean.card.CustomField; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.io.Serializable; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUpdateRequest.java similarity index 92% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdateRequest.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUpdateRequest.java index 8c1f85351..75aa99049 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdateRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUpdateRequest.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.card; +package me.chanjar.weixin.mp.bean.card.membercard; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUserForm.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUserForm.java similarity index 97% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUserForm.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUserForm.java index 1087af38a..9edc0f89b 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUserForm.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUserForm.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.card; +package me.chanjar.weixin.mp.bean.card.membercard; import java.io.Serializable; import java.util.ArrayList; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUserFormRichField.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUserFormRichField.java similarity index 89% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUserFormRichField.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUserFormRichField.java index e109ebc66..a9837029d 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUserFormRichField.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUserFormRichField.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.card; +package me.chanjar.weixin.mp.bean.card.membercard; import java.util.ArrayList; import java.util.List; @@ -31,7 +31,7 @@ public class MemberCardUserFormRichField { public void add(String value) { if (valueList == null) { - valueList = new ArrayList(); + valueList = new ArrayList<>(); } valueList.add(value); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUserInfo.java similarity index 86% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUserInfo.java index c039d72a1..e411e19e9 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUserInfo.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import lombok.Data; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/NameValues.java similarity index 85% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/NameValues.java index f28585553..32275e8ce 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/NameValues.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import lombok.Data; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/NotifyOptional.java similarity index 95% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/NotifyOptional.java index c4d25c97e..139db6855 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/NotifyOptional.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivateTempInfoResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardActivateTempInfoResult.java similarity index 90% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivateTempInfoResult.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardActivateTempInfoResult.java index 120e32670..07b2d2571 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivateTempInfoResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardActivateTempInfoResult.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import lombok.Data; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; 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/card/membercard/WxMpMemberCardActivatedMessage.java similarity index 97% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardActivatedMessage.java index 9b1ac647c..b7379dfb8 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/card/membercard/WxMpMemberCardActivatedMessage.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardCreateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardCreateMessage.java similarity index 84% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardCreateMessage.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardCreateMessage.java index d8842c73d..c1979751f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardCreateMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardCreateMessage.java @@ -1,10 +1,9 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import java.io.Serializable; import com.google.gson.annotations.SerializedName; import lombok.Data; -import me.chanjar.weixin.mp.bean.card.MemberCardCreateRequest; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; @Data 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/card/membercard/WxMpMemberCardUpdateMessage.java similarity index 97% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardUpdateMessage.java index 526055b76..86d3c0aff 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/card/membercard/WxMpMemberCardUpdateMessage.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import com.google.gson.annotations.SerializedName; import lombok.Data; 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/card/membercard/WxMpMemberCardUpdateResult.java similarity index 94% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardUpdateResult.java index 7b9dfb492..663fe1f1e 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/card/membercard/WxMpMemberCardUpdateResult.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import java.io.Serializable; 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/card/membercard/WxMpMemberCardUserInfoResult.java similarity index 95% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardUserInfoResult.java index fca7da928..8fad40ccf 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/card/membercard/WxMpMemberCardUserInfoResult.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import java.io.Serializable; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java index b7a4df93f..82e2b3631 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java @@ -9,9 +9,9 @@ import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserCumulate; import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserSummary; import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage; import me.chanjar.weixin.mp.bean.material.*; -import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardActivateTempInfoResult; -import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateResult; -import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult; +import me.chanjar.weixin.mp.bean.card.membercard.WxMpMemberCardActivateTempInfoResult; +import me.chanjar.weixin.mp.bean.card.membercard.WxMpMemberCardUpdateResult; +import me.chanjar.weixin.mp.bean.card.membercard.WxMpMemberCardUserInfoResult; import me.chanjar.weixin.mp.bean.result.*; import me.chanjar.weixin.mp.bean.subscribe.WxMpSubscribeMessage; import me.chanjar.weixin.mp.bean.template.WxMpTemplateIndustry; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardActivateTempInfoResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardActivateTempInfoResultGsonAdapter.java index a38a27aa0..fc554c480 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardActivateTempInfoResultGsonAdapter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardActivateTempInfoResultGsonAdapter.java @@ -2,9 +2,9 @@ package me.chanjar.weixin.mp.util.json; import com.google.gson.*; import me.chanjar.weixin.common.util.json.GsonHelper; -import me.chanjar.weixin.mp.bean.membercard.MemberCardUserInfo; -import me.chanjar.weixin.mp.bean.membercard.NameValues; -import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardActivateTempInfoResult; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCardUserInfo; +import me.chanjar.weixin.mp.bean.card.membercard.NameValues; +import me.chanjar.weixin.mp.bean.card.membercard.WxMpMemberCardActivateTempInfoResult; import java.lang.reflect.Type; 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 0d4594631..2690d3416 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 @@ -6,7 +6,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import me.chanjar.weixin.common.util.json.GsonHelper; -import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateResult; +import me.chanjar.weixin.mp.bean.card.membercard.WxMpMemberCardUpdateResult; import java.lang.reflect.Type; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java index 82790a0b0..270e67e8e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java @@ -9,9 +9,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import me.chanjar.weixin.common.util.json.GsonHelper; -import me.chanjar.weixin.mp.bean.membercard.MemberCardUserInfo; -import me.chanjar.weixin.mp.bean.membercard.NameValues; -import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult; +import me.chanjar.weixin.mp.bean.card.membercard.MemberCardUserInfo; +import me.chanjar.weixin.mp.bean.card.membercard.NameValues; +import me.chanjar.weixin.mp.bean.card.membercard.WxMpMemberCardUserInfoResult; import static me.chanjar.weixin.common.util.json.GsonHelper.getString; diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImplTest.java index 7f611ab8a..73dcb22a2 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImplTest.java @@ -7,7 +7,7 @@ import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.test.ApiTestModule; import me.chanjar.weixin.mp.bean.card.*; import me.chanjar.weixin.mp.bean.card.enums.CardSceneType; -import me.chanjar.weixin.mp.bean.membercard.*; +import me.chanjar.weixin.mp.bean.card.membercard.*; import org.testng.annotations.Guice; import org.testng.annotations.Test; diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResultTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardUpdateResultTest.java similarity index 93% rename from weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResultTest.java rename to weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardUpdateResultTest.java index 573fa2860..f41496755 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResultTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardUpdateResultTest.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import org.testng.annotations.Test; diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResultTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardUserInfoResultTest.java similarity index 98% rename from weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResultTest.java rename to weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardUserInfoResultTest.java index da8ff3da3..714ec9728 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResultTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/card/membercard/WxMpMemberCardUserInfoResultTest.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.membercard; +package me.chanjar.weixin.mp.bean.card.membercard; import org.testng.annotations.Test;