From 6633ea3ca7a3bbb4ef4e44b4706448e3a1742750 Mon Sep 17 00:00:00 2001 From: S Date: Thu, 9 Apr 2020 13:39:33 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#1496=20=E6=9B=B4=E6=94=B9=E5=8D=A1?= =?UTF-8?q?=E5=88=B8=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=97=A8=E5=BA=97=E4=BD=8D?= =?UTF-8?q?=E7=BD=AEID=E5=AD=97=E6=AE=B5=E7=9A=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/impl/WxMpMemberCardServiceImpl.java | 2 +- .../main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java | 3 ++- .../java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java | 3 ++- .../weixin/mp/bean/card/enums/CardWechatFieldType.java | 6 +++++- .../weixin/mp/bean/datacube/WxDataCubeArticleResult.java | 3 ++- .../chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java | 3 ++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java index 5e434d61..dc70a7b9 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java @@ -188,7 +188,7 @@ public class WxMpMemberCardServiceImpl implements WxMpMemberCardService { dateInfoType.getDescription())); } - if (!baseInfo.isUseAllLocations() && StringUtils.isBlank(baseInfo.getLocationIdList())) { + if (!baseInfo.isUseAllLocations() && baseInfo.getLocationIdList().isEmpty()) { return WxMpCardCreateResult.failure("会员卡基本信息的门店使用范围选择指定门店,门店列表:locationIdList不能为空"); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java index ed335494..f7ed2ed9 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java @@ -1,6 +1,7 @@ package me.chanjar.weixin.mp.bean.card; import java.io.Serializable; +import java.util.List; import com.google.gson.annotations.SerializedName; import lombok.Data; @@ -104,7 +105,7 @@ public class BaseInfo implements Serializable { * 门店位置ID,调用 POI门店管理接口 获取门店位置ID. */ @SerializedName("location_id_list") - private String locationIdList; + private List locationIdList; /** * 会员卡是否支持全部门店,填写后商户门店更新时会自动同步至卡券. diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java index e7681dec..44b92eff 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java @@ -5,6 +5,7 @@ import lombok.Data; import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import java.io.Serializable; +import java.util.List; /** * 微信会员卡基本信息更新 @@ -54,7 +55,7 @@ public class BaseInfoUpdate implements Serializable { * 门店位置ID,调用 POI门店管理接口 获取门店位置ID. */ @SerializedName("location_id_list") - private String locationIdList; + private List locationIdList; /** * 会员卡是否支持全部门店,填写后商户门店更新时会自动同步至卡券. diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardWechatFieldType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardWechatFieldType.java index 3a62c6f4..1d57bbda 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardWechatFieldType.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardWechatFieldType.java @@ -14,7 +14,11 @@ public enum CardWechatFieldType { USER_FORM_INFO_FLAG_IDCARD("身份证"), USER_FORM_INFO_FLAG_EMAIL("邮箱"), USER_FORM_INFO_FLAG_LOCATION("详细地址"), - USER_FORM_INFO_FLAG_EDUCATION_BACKGRO("教育背景"), + + /** + * 原文档为 USER_FORM_INFO_FLAG_EDUCATION_BACKGRO, 测试不通过,可能是文档错误 + */ + USER_FORM_INFO_FLAG_EDUCATION_BACKGROUND("教育背景"), USER_FORM_INFO_FLAG_INDUSTRY("行业"), USER_FORM_INFO_FLAG_INCOME("收入"), USER_FORM_INFO_FLAG_HABIT("兴趣爱好"); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java index 39198821..f625072f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java @@ -108,7 +108,8 @@ public class WxDataCubeArticleResult extends WxDataCubeBaseResult { /** * user_source - * 在获取图文阅读分时数据时才有该字段,代表用户从哪里进入来阅读该图文。0:会话;1.好友;2.朋友圈;3.腾讯微博;4.历史消息页;5.其他 + * 在获取图文统计数据、图文阅读分时数据时才有该字段,代表用户从哪里进入来阅读该图文。 + * 99999999.全部;0:会话;1.好友;2.朋友圈;3.腾讯微博;4.历史消息页;5.其他;6.看一看;7.搜一搜; */ @SerializedName("user_source") private Integer userSource; 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 4fa75b7f..ecacc36d 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 @@ -1,5 +1,6 @@ package me.chanjar.weixin.mp.api.impl; +import com.google.common.collect.Lists; import com.google.inject.Inject; import me.chanjar.weixin.common.bean.WxCardApiSignature; import me.chanjar.weixin.common.error.WxErrorException; @@ -134,7 +135,7 @@ public class WxMpCardServiceImplTest { base.setCustomUrlSubTitle("副标题tip"); base.setPromotionUrlName("更多优惠"); base.setPromotionUrl("http://www.qq.com"); - base.setLocationIdList("1234"); + base.setLocationIdList(Lists.newArrayList("1234")); //团购券 WxMpCardCreateRequest grouponMessage = new WxMpCardCreateRequest();