From 0eed5e6b59f5d24415f720810c39e67a9b3a3f2d Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Thu, 22 Aug 2019 16:44:17 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E5=92=8C=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/mp/api/WxMpCardService.java | 5 +++-- .../weixin/mp/api/impl/WxMpCardServiceImpl.java | 2 +- .../mp/bean/card/AbstractCardCreateRequest.java | 17 +++++++++++++++++ .../weixin/mp/bean/card/CardCreateRequest.java | 13 ------------- .../mp/bean/card/CashCardCreateRequest.java | 9 +++++++-- .../mp/bean/card/DiscountCardCreateRequest.java | 2 +- .../mp/bean/card/GeneralCardCreateRequest.java | 2 +- .../mp/bean/card/GiftCardCreateRequest.java | 2 +- .../mp/bean/card/GrouponCardCreateRequest.java | 2 +- ...eMessage.java => WxMpCardCreateRequest.java} | 14 ++++++++++---- .../weixin/mp/bean/card/WxMpCardResult.java | 2 +- .../mp/api/impl/WxMpCardServiceImplTest.java | 10 +++++----- 12 files changed, 48 insertions(+), 32 deletions(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/AbstractCardCreateRequest.java delete mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CardCreateRequest.java rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/{WxMpCardCreateMessage.java => WxMpCardCreateRequest.java} (57%) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpCardService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpCardService.java index f5131e8f..903fd94d 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpCardService.java +++ b/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; /** * 将用户的卡券设置为失效状态. diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java index ec523f9a..2854ec16 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java +++ b/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); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/AbstractCardCreateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/AbstractCardCreateRequest.java new file mode 100644 index 00000000..7655b240 --- /dev/null +++ b/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; + +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CardCreateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CardCreateRequest.java deleted file mode 100644 index 8cb16bc7..00000000 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CardCreateRequest.java +++ /dev/null @@ -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 { -} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CashCardCreateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CashCardCreateRequest.java index dcefab0e..ab4d54e4 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/CashCardCreateRequest.java +++ b/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"; 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 b527ec12..e125c190 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 @@ -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") 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 f1ac5698..4125011b 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 @@ -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") diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GiftCardCreateRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GiftCardCreateRequest.java index 5271763f..a757b00f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GiftCardCreateRequest.java +++ b/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") 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 aeab1fd3..1f001549 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 @@ -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") diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardCreateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardCreateRequest.java similarity index 57% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardCreateMessage.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardCreateRequest.java index 760002cb..051dad29 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardCreateMessage.java +++ b/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); } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardResult.java index 9343cb40..b85dd7a8 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/WxMpCardResult.java +++ b/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 diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java index b736f908..9238fd3b 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java +++ b/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);