From 3e948ec01bb8e426145635123fa2f38d66a08013 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Thu, 22 Aug 2019 17:35:05 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/{GeneralCard.java => GeneralCoupon.java} | 10 +++++----- ...eRequest.java => GeneralCouponCreateRequest.java} | 6 +++--- .../weixin/mp/api/impl/WxMpCardServiceImplTest.java | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/{GeneralCard.java => GeneralCoupon.java} (67%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/{GeneralCardCreateRequest.java => GeneralCouponCreateRequest.java} (78%) 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/GeneralCoupon.java similarity index 67% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCard.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCoupon.java index 2264d8ec..df8194a6 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/GeneralCoupon.java @@ -10,15 +10,15 @@ import java.io.Serializable; /** * . * @author leeis - * @Date 2018/12/29 + * @date 2018/12/29 */ @Data @EqualsAndHashCode(callSuper = true) -public final class GeneralCard extends Card implements Serializable { +public final class GeneralCoupon extends Card implements Serializable { private static final long serialVersionUID = -1577656733441132585L; /** - * 兑换券专用,填写兑换内容的名称。 + * 兑换券专用,填写兑换内容的名称. */ @SerializedName("default_detail") private String defaultDetail; @@ -28,7 +28,7 @@ public final class GeneralCard extends Card implements Serializable { return WxMpGsonBuilder.create().toJson(this); } - public static GeneralCard fromJson(String json) { - return WxMpGsonBuilder.create().fromJson(json, GeneralCard.class); + public static GeneralCoupon fromJson(String json) { + return WxMpGsonBuilder.create().fromJson(json, GeneralCoupon.class); } } 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/GeneralCouponCreateRequest.java similarity index 78% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCardCreateRequest.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/GeneralCouponCreateRequest.java index 4125011b..b44dc74c 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/GeneralCouponCreateRequest.java @@ -10,18 +10,18 @@ import java.io.Serializable; /** * . * @author leeis - * @Date 2018/12/29 + * @date 2018/12/29 */ @Data @EqualsAndHashCode(callSuper = true) -public class GeneralCardCreateRequest extends AbstractCardCreateRequest implements Serializable { +public class GeneralCouponCreateRequest extends AbstractCardCreateRequest implements Serializable { private static final long serialVersionUID = 1771355872211267723L; @SerializedName("card_type") private String cardType = "GENERAL_COUPON"; @SerializedName("general_coupon") - private GeneralCard generalCoupon; + private GeneralCoupon generalCoupon; @Override public String toString() { 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 9238fd3b..948af00c 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 @@ -186,13 +186,13 @@ public class WxMpCardServiceImplTest { //普通兑换券 WxMpCardCreateRequest generalMessage = new WxMpCardCreateRequest(); - GeneralCardCreateRequest generalCardCreateRequest = new GeneralCardCreateRequest(); - GeneralCard generalCard = new GeneralCard(); - generalCard.setBaseInfo(base); - generalCard.setDefaultDetail("音乐木盒"); + GeneralCouponCreateRequest generalCouponCreateRequest = new GeneralCouponCreateRequest(); + GeneralCoupon generalCoupon = new GeneralCoupon(); + generalCoupon.setBaseInfo(base); + generalCoupon.setDefaultDetail("音乐木盒"); - generalCardCreateRequest.setGeneralCoupon(generalCard); - generalMessage.setCardCreateRequest(generalCardCreateRequest); + generalCouponCreateRequest.setGeneralCoupon(generalCoupon); + generalMessage.setCardCreateRequest(generalCouponCreateRequest); System.out.println(this.wxService.getCardService().createCard(generalMessage)); }