From 4ee3467fc3c29120a145acec297081e4c02f49b9 Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Thu, 19 Sep 2019 19:33:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E6=A0=B8=E9=94=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 1bf61ffe39..57e3c3f316 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 @@ -348,7 +348,11 @@ public void cardSelfConsumeCellSet(String cardId, Boolean isOpen, param.addProperty("is_open", isOpen); param.addProperty("need_verify_cod", needVerifyCod); param.addProperty("need_remark_amount", needRemarkAmount); +<<<<<<< HEAD this.wxMpService.post(WxMpApiUrl.Card.CARD_SELF_CONSUME_CELL_SET, param.toString()); +======= + this.wxMpService.post(WxMpApiUrl.Card.CARD_PAYCELL_SET, param.toString()); +>>>>>>> :sparkles: 增加自助核销接口 } From 153608bfcd64241257e13f69856dcd5af8b67bc3 Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Thu, 19 Sep 2019 19:36:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?:bug:=20=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) 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 57e3c3f316..1bf61ffe39 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 @@ -348,11 +348,7 @@ public void cardSelfConsumeCellSet(String cardId, Boolean isOpen, param.addProperty("is_open", isOpen); param.addProperty("need_verify_cod", needVerifyCod); param.addProperty("need_remark_amount", needRemarkAmount); -<<<<<<< HEAD this.wxMpService.post(WxMpApiUrl.Card.CARD_SELF_CONSUME_CELL_SET, param.toString()); -======= - this.wxMpService.post(WxMpApiUrl.Card.CARD_PAYCELL_SET, param.toString()); ->>>>>>> :sparkles: 增加自助核销接口 } From 07140af41bb041bd3f3aadccb8c6bc776ec86bbb Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Fri, 17 Jan 2020 11:48:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/binarywang/wxpay/bean/result/BaseWxPayResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java index d58f20fb18..00b73a9c30 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java @@ -333,7 +333,7 @@ public void checkResult(WxPayService wxPayService, String signType, boolean chec //校验结果是否成功 if (checkSuccess) { - List successStrings = Lists.newArrayList(WxPayConstants.ResultCode.SUCCESS, ""); + List successStrings = Lists.newArrayList(WxPayConstants.ResultCode.SUCCESS); if (!successStrings.contains(StringUtils.trimToEmpty(getReturnCode()).toUpperCase()) || !successStrings.contains(StringUtils.trimToEmpty(getResultCode()).toUpperCase())) { StringBuilder errorMsg = new StringBuilder(); From 7fc5e7501b9ed983ac3d637e83ecbb9c5a58024f Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Sun, 19 Jan 2020 11:15:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?:sparkles:=20=E4=BF=AE=E6=94=B9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/binarywang/wxpay/bean/result/BaseWxPayResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java index 00b73a9c30..d58f20fb18 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/BaseWxPayResult.java @@ -333,7 +333,7 @@ public void checkResult(WxPayService wxPayService, String signType, boolean chec //校验结果是否成功 if (checkSuccess) { - List successStrings = Lists.newArrayList(WxPayConstants.ResultCode.SUCCESS); + List successStrings = Lists.newArrayList(WxPayConstants.ResultCode.SUCCESS, ""); if (!successStrings.contains(StringUtils.trimToEmpty(getReturnCode()).toUpperCase()) || !successStrings.contains(StringUtils.trimToEmpty(getResultCode()).toUpperCase())) { StringBuilder errorMsg = new StringBuilder(); From a60de3fac6839d8539437afc88435df4f644b775 Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Tue, 24 Mar 2020 14:29:15 +0800 Subject: [PATCH 5/6] =?UTF-8?q?:sparkles:=20=E4=B8=80=E4=BA=9B=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/bean/card/Sku.java | 9 ++++++- .../mp/bean/card/enums/CardCodeType.java | 21 +++++++++++++++ .../mp/bean/card/enums/CardStatusType.java | 19 ++++++++++++++ .../bean/card/enums/CustomFieldNameType.java | 26 +++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardCodeType.java create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardStatusType.java create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CustomFieldNameType.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/Sku.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/Sku.java index 504d56bf17..005da7f06e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/Sku.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/Sku.java @@ -15,11 +15,18 @@ public class Sku implements Serializable { /** - * 卡券库存的数量,不支持填写0，上限为100000000。 + * 卡券库存的数量，不支持填写0，上限为100000000 */ @SerializedName("quantity") private Integer quantity = 100000000; + /** + * 卡券全部库存的数量，上限为100000000。 + * https://developers.weixin.qq.com/doc/offiaccount/Cards_and_Offer/Managing_Coupons_Vouchers_and_Cards.html#4 + */ + @SerializedName("total_quantity") + private Integer totalQuantity = 100000000; + @Override public String toString() { return WxMpGsonBuilder.create().toJson(this); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardCodeType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardCodeType.java new file mode 100644 index 0000000000..35263188e0 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardCodeType.java @@ -0,0 +1,21 @@ +package me.chanjar.weixin.mp.bean.card.enums; + +public enum CardCodeType { + + CODE_TYPE_TEXT("文本"), + CODE_TYPE_NONE("不显示任何码型"), + CODE_TYPE_ONLY_BARCODE("仅显示一维码"), + CODE_TYPE_ONLY_QRCODE("仅显示二维码"), + CODE_TYPE_BARCODE("一维码"), + CODE_TYPE_QRCODE("二维码"); + + private String description; + + CardCodeType(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardStatusType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardStatusType.java new file mode 100644 index 0000000000..4108b7d4c2 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardStatusType.java @@ -0,0 +1,19 @@ +package me.chanjar.weixin.mp.bean.card.enums; + +public enum CardStatusType { + CARD_STATUS_NOT_VERIFY("待审核"), + CARD_STATUS_VERIFY_FAIL("审核失败"), + CARD_STATUS_VERIFY_OK("通过审核"), + CARD_STATUS_DELETE("卡券被商户删除"), + CARD_STATUS_DISPATCH("在公众平台投放过的卡券"); + + private String description; + + CardStatusType(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CustomFieldNameType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CustomFieldNameType.java new file mode 100644 index 0000000000..53f3df8cf9 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CustomFieldNameType.java @@ -0,0 +1,26 @@ +package me.chanjar.weixin.mp.bean.card.enums; + +/** + * 会员信息类目半自定义名称，当开发者变更这类类目信息的value值时 可以选择触发系统模板消息通知用户。 + */ +public enum CustomFieldNameType { + + FIELD_NAME_TYPE_LEVEL("等级"), + FIELD_NAME_TYPE_COUPON("优惠券"), + FIELD_NAME_TYPE_STAMP("印花"), + FIELD_NAME_TYPE_DISCOUNT("折扣"), + FIELD_NAME_TYPE_ACHIEVEMEN("成就"), + FIELD_NAME_TYPE_MILEAGE("里程"), + FIELD_NAME_TYPE_SET_POINTS("集点"), + FIELD_NAME_TYPE_TIMS("次数"); + + private String description; + + CustomFieldNameType(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } +} From b924b638d0a59a29a279a7884537517462045104 Mon Sep 17 00:00:00 2001 From: SuShaohua Date: Fri, 27 Mar 2020 19:44:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxDataCubeArticleTotalDetail.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java index 0c3bf2916c..a07974f42c 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java @@ -198,4 +198,29 @@ public class WxDataCubeArticleTotalDetail implements Serializable { @SerializedName("feed_share_from_other_cnt") private Integer feedShareFromOtherCnt; + + /** + * intpagefromkanyikanreaduser 看一看来源阅读人数 + */ + @SerializedName("int_page_from_kanyikan_read_user") + private Integer intPageFromKanyikanReadUser; + + /** + * intpagefromkanyikanreadcount 看一看来源阅读次数 + */ + @SerializedName("int_page_from_kanyikan_read_count") + private Integer intPageFromKanyikanReadCount; + + /** + * intpagefromsouyisoureaduser 搜一搜来源阅读人数 + */ + @SerializedName("int_page_from_souyisou_read_user") + private Integer intPageFromSouyisouReadUser; + + /** + * intpagefromsouyisoureadcount 搜一搜来源阅读次数 + */ + @SerializedName("int_page_from_souyisou_read_count") + private Integer intPageFromSouyisouReadCount; + }