🎨 优化和规范化部分代码

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpCardService.java

@@ -138,7 +138,7 @@ public interface WxMpCardService {
    * @return result
    * @throws WxErrorException 异常
    */
-  WxMpCardCreateResult createCard(WxMpCardCreateMessage cardCreateMessage) throws WxErrorException;
+  WxMpCardCreateResult createCard(WxMpCardCreateRequest cardCreateMessage) throws WxErrorException;
 
   /**
    * 创建卡券二维码.
@@ -183,7 +183,8 @@ public interface WxMpCardService {
    * @return WxMpCardLandingPageCreateResult
    * @throws WxErrorException 异常
    */
-  WxMpCardLandingPageCreateResult createLandingPage(WxMpCardLandingPageCreateRequest createRequest) throws WxErrorException;
+  WxMpCardLandingPageCreateResult createLandingPage(WxMpCardLandingPageCreateRequest createRequest)
+    throws WxErrorException;
 
   /**
    * 将用户的卡券设置为失效状态.

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java

@@ -178,7 +178,7 @@ public class WxMpCardServiceImpl implements WxMpCardService {
   }
 
   @Override
-  public WxMpCardCreateResult createCard(WxMpCardCreateMessage cardCreateMessage) throws WxErrorException {
+  public WxMpCardCreateResult createCard(WxMpCardCreateRequest cardCreateMessage) throws WxErrorException {
     String response = this.wxMpService.post(WxMpApiUrl.Card.CARD_CREATE, GSON.toJson(cardCreateMessage));
     return WxMpCardCreateResult.fromJson(response);
   }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/AbstractCardCreateRequest.java

@@ -0,0 +1,17 @@
+package me.chanjar.weixin.mp.bean.card;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * .
+ *
+ * @author leeis
+ * @date 2018/12/29
+ */
+@Data
+public abstract class AbstractCardCreateRequest implements Serializable {
+  private static final long serialVersionUID = -260291223712818801L;
+
+}

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CardCreateRequest.java

@@ -1,13 +0,0 @@
-package me.chanjar.weixin.mp.bean.card;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Author leeis
- * @Date 2018/12/29
- */
-@Data
-public class CardCreateRequest implements Serializable {
-}

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CashCardCreateRequest.java

@@ -2,17 +2,22 @@ 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;
 
 /**
  * .
+ *
  * @author leeis
- * @Date 2018/12/29
+ * @date 2018/12/29
  */
 @Data
-public class CashCardCreateRequest extends CardCreateRequest implements Serializable {
+@EqualsAndHashCode(callSuper = false)
+public class CashCardCreateRequest extends AbstractCardCreateRequest implements Serializable {
+  private static final long serialVersionUID = 8251635683908302125L;
+
   @SerializedName("card_type")
   private String cardType = "CASH";
 

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/DiscountCardCreateRequest.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DiscountCardCreateRequest extends CardCreateRequest implements Serializable {
+public class DiscountCardCreateRequest extends AbstractCardCreateRequest implements Serializable {
   private static final long serialVersionUID = 1190518086576489692L;
 
   @SerializedName("card_type")

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCardCreateRequest.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GeneralCardCreateRequest extends CardCreateRequest implements Serializable {
+public class GeneralCardCreateRequest extends AbstractCardCreateRequest implements Serializable {
   private static final long serialVersionUID = 1771355872211267723L;
 
   @SerializedName("card_type")

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GiftCardCreateRequest.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GiftCardCreateRequest extends CardCreateRequest implements Serializable {
+public class GiftCardCreateRequest extends AbstractCardCreateRequest implements Serializable {
   private static final long serialVersionUID = 1283655452584811858L;
 
   @SerializedName("card_type")

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GrouponCardCreateRequest.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GrouponCardCreateRequest extends CardCreateRequest implements Serializable {
+public class GrouponCardCreateRequest extends AbstractCardCreateRequest implements Serializable {
   private static final long serialVersionUID = 7551441058859934512L;
 
   @SerializedName("card_type")

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardCreateRequest.java

@@ -6,18 +6,24 @@ import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 import java.io.Serializable;
 
+/**
+ * .
+ *
+ * @author IOMan
+ */
 @Data
-public final class WxMpCardCreateMessage implements Serializable {
+public final class WxMpCardCreateRequest implements Serializable {
+  private static final long serialVersionUID = 5951280855309617585L;
 
   @SerializedName("card")
-  private CardCreateRequest cardCreateRequest;
+  private AbstractCardCreateRequest cardCreateRequest;
 
   @Override
   public String toString() {
     return WxMpGsonBuilder.create().toJson(this);
   }
 
-  public static WxMpCardCreateMessage fromJson(String json) {
-    return WxMpGsonBuilder.create().fromJson(json, WxMpCardCreateMessage.class);
+  public static WxMpCardCreateRequest fromJson(String json) {
+    return WxMpGsonBuilder.create().fromJson(json, WxMpCardCreateRequest.class);
   }
 }

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardResult.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 /**
- * 卡券查询Code，核销Code接口返回结果
+ * 卡券查询Code，核销Code接口返回结果.
  *
  * @author YuJian
  * @version 15/11/11

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java

@@ -137,7 +137,7 @@ public class WxMpCardServiceImplTest {
     base.setLocationIdList("1234");
 
     //团购券
-    WxMpCardCreateMessage grouponMessage = new WxMpCardCreateMessage();
+    WxMpCardCreateRequest grouponMessage = new WxMpCardCreateRequest();
     GrouponCardCreateRequest grouponCardCreateRequest = new GrouponCardCreateRequest();
     GrouponCard grouponCard = new GrouponCard();
     grouponCard.setBaseInfo(base);
@@ -149,7 +149,7 @@ public class WxMpCardServiceImplTest {
     System.out.println(this.wxService.getCardService().createCard(grouponMessage));
 
     //现金券
-    WxMpCardCreateMessage cashMessage = new WxMpCardCreateMessage();
+    WxMpCardCreateRequest cashMessage = new WxMpCardCreateRequest();
     CashCardCreateRequest cashCardCreateRequest = new CashCardCreateRequest();
     CashCard cashCard = new CashCard();
     cashCard.setBaseInfo(base);
@@ -162,7 +162,7 @@ public class WxMpCardServiceImplTest {
     System.out.println(this.wxService.getCardService().createCard(cashMessage));
 
     //折扣券
-    WxMpCardCreateMessage discountMessage = new WxMpCardCreateMessage();
+    WxMpCardCreateRequest discountMessage = new WxMpCardCreateRequest();
     DiscountCardCreateRequest discountCardCreateRequest = new DiscountCardCreateRequest();
     DiscountCard discountCard = new DiscountCard();
     discountCard.setBaseInfo(base);
@@ -174,7 +174,7 @@ public class WxMpCardServiceImplTest {
     System.out.println(this.wxService.getCardService().createCard(discountMessage));
 
     //兑换券
-    WxMpCardCreateMessage giftMessage = new WxMpCardCreateMessage();
+    WxMpCardCreateRequest giftMessage = new WxMpCardCreateRequest();
     GiftCardCreateRequest giftCardCreateRequest = new GiftCardCreateRequest();
     GiftCard giftCard = new GiftCard();
     giftCard.setBaseInfo(base);
@@ -185,7 +185,7 @@ public class WxMpCardServiceImplTest {
     System.out.println(this.wxService.getCardService().createCard(giftMessage));
 
     //普通兑换券
-    WxMpCardCreateMessage generalMessage = new WxMpCardCreateMessage();
+    WxMpCardCreateRequest generalMessage = new WxMpCardCreateRequest();
     GeneralCardCreateRequest generalCardCreateRequest = new GeneralCardCreateRequest();
     GeneralCard generalCard = new GeneralCard();
     generalCard.setBaseInfo(base);