From 89e092b04ded5cb2c26d48704e81d5b19aa09fa7 Mon Sep 17 00:00:00 2001 From: YuJian Date: Sat, 31 Oct 2015 17:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E4=BA=8E=E5=8D=A1?= =?UTF-8?q?=E5=88=B8=E4=BA=8B=E4=BB=B6=E6=8E=A8=E9=80=81=E7=9A=84=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E3=80=81XML=E6=B6=88=E6=81=AF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/common/api/WxConsts.java | 11 +++- .../weixin/mp/bean/WxMpXmlMessage.java | 66 +++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java index 0455e6c2..85efcd3f 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java @@ -47,7 +47,7 @@ public class WxConsts { /////////////////////// public static final String MASS_ST_SUCCESS = "send success"; public static final String MASS_ST_FAIL = "send fail"; - public static final String MASS_ST_涉嫌广告 = "err(10001)"; + public static final String MASS_ST_涉嫌广告 = "err(10001)"; public static final String MASS_ST_涉嫌政治 = "err(20001)"; public static final String MASS_ST_涉嫌社会 = "err(20004)"; public static final String MASS_ST_涉嫌色情 = "err(20002)"; @@ -93,6 +93,15 @@ public class WxConsts { public static final String EVT_LOCATION_SELECT = "location_select"; public static final String EVT_TEMPLATESENDJOBFINISH = "TEMPLATESENDJOBFINISH"; public static final String EVT_ENTER_AGENT = "enter_agent"; + public static final String EVT_CARD_PASS_CHECK = "card_pass_check"; + public static final String EVT_CARD_NOT_PASS_CHECK = "card_not_pass_check"; + public static final String EVT_USER_GET_CARD = "user_get_card"; + public static final String EVT_USER_DEL_CARD = "user_del_card"; + public static final String EVT_USER_CONSUME_CARD = "user_consume_card"; + public static final String EVT_USER_PAY_FROM_PAY_CELL = "user_pay_from_pay_cell"; + public static final String EVT_USER_VIEW_CARD = "user_view_card"; + public static final String EVT_USER_ENTER_SESSION_FROM_CARD = "user_enter_session_from_card"; + public static final String EVT_CARD_SKU_REMIND = "card_sku_remind"; // 库存报警 /////////////////////// // 上传多媒体文件的类型 diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java index 8796b110..9c109d24 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java @@ -150,6 +150,27 @@ public class WxMpXmlMessage implements Serializable { @XStreamAlias("ErrorCount") private Integer errorCount; + /////////////////////////////////////// + // 卡券相关事件推送 + /////////////////////////////////////// + @XStreamAlias("CardId") + @XStreamConverter(value=XStreamCDataConverter.class) + private String cardId; + + @XStreamAlias("IsGiveByFriend") + private Integer isGiveByFriend; // 是否为转赠,1代表是,0代表否 + + @XStreamAlias("UserCardCode") + @XStreamConverter(value=XStreamCDataConverter.class) + private String userCardCode; + + @XStreamAlias("OldUserCardCode") + @XStreamConverter(value=XStreamCDataConverter.class) + private String oldUserCardCode; + + @XStreamAlias("OuterId") + private Integer outerId; + @XStreamAlias("ScanCodeInfo") private ScanCodeInfo scanCodeInfo = new ScanCodeInfo(); @@ -456,6 +477,46 @@ public class WxMpXmlMessage implements Serializable { this.errorCount = errorCount; } + public String getCardId() { + return cardId; + } + + public void setCardId(String cardId) { + this.cardId = cardId; + } + + public Integer getIsGiveByFriend() { + return isGiveByFriend; + } + + public void setIsGiveByFriend(Integer isGiveByFriend) { + this.isGiveByFriend = isGiveByFriend; + } + + public String getUserCardCode() { + return userCardCode; + } + + public void setUserCardCode(String userCardCode) { + this.userCardCode = userCardCode; + } + + public String getOldUserCardCode() { + return oldUserCardCode; + } + + public void setOldUserCardCode(String oldUserCardCode) { + this.oldUserCardCode = oldUserCardCode; + } + + public Integer getOuterId() { + return outerId; + } + + public void setOuterId(Integer outerId) { + this.outerId = outerId; + } + public WxMpXmlMessage.ScanCodeInfo getScanCodeInfo() { return scanCodeInfo; } @@ -652,6 +713,11 @@ public class WxMpXmlMessage implements Serializable { ", filterCount=" + filterCount + ", sentCount=" + sentCount + ", errorCount=" + errorCount + + ", cardId='" + cardId + '\'' + + ", isGiveByFriend=" + isGiveByFriend + + ", userCardCode='" + userCardCode + '\'' + + ", oldUserCardCode='" + oldUserCardCode + '\'' + + ", outerId=" + outerId + ", scanCodeInfo=" + scanCodeInfo + ", sendPicsInfo=" + sendPicsInfo + ", sendLocationInfo=" + sendLocationInfo +