🎨 会员卡相关bean类重构，集中到同一包中

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.*;
 
 /**
  * 会员卡相关接口.

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;

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;

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;
 

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;
 
 /**

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);
   }

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;
 

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;

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;

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;

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;

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<String>();
+      valueList = new ArrayList<>();
     }
     valueList.add(value);
   }

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;
 

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;
 

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;

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;

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;

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

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;

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;
 

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;