Skip to content

Commit 6633ea3

Browse files
authored
🎨 #1496 更改卡券接口的门店位置ID字段的类型
1 parent a976696 commit 6633ea3

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ private WxMpCardCreateResult validCheck(WxMpMemberCardCreateMessage createMessag
188188
dateInfoType.getDescription()));
189189
}
190190

191-
if (!baseInfo.isUseAllLocations() && StringUtils.isBlank(baseInfo.getLocationIdList())) {
191+
if (!baseInfo.isUseAllLocations() && baseInfo.getLocationIdList().isEmpty()) {
192192
return WxMpCardCreateResult.failure("会员卡基本信息的门店使用范围选择指定门店,门店列表:locationIdList不能为空");
193193
}
194194

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package me.chanjar.weixin.mp.bean.card;
22

33
import java.io.Serializable;
4+
import java.util.List;
45

56
import com.google.gson.annotations.SerializedName;
67
import lombok.Data;
@@ -104,7 +105,7 @@ public class BaseInfo implements Serializable {
104105
* 门店位置ID,调用 POI门店管理接口 获取门店位置ID.
105106
*/
106107
@SerializedName("location_id_list")
107-
private String locationIdList;
108+
private List<String> locationIdList;
108109

109110
/**
110111
* 会员卡是否支持全部门店,填写后商户门店更新时会自动同步至卡券.

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
66

77
import java.io.Serializable;
8+
import java.util.List;
89

910
/**
1011
* 微信会员卡基本信息更新
@@ -54,7 +55,7 @@ public class BaseInfoUpdate implements Serializable {
5455
* 门店位置ID,调用 POI门店管理接口 获取门店位置ID.
5556
*/
5657
@SerializedName("location_id_list")
57-
private String locationIdList;
58+
private List<String> locationIdList;
5859

5960
/**
6061
* 会员卡是否支持全部门店,填写后商户门店更新时会自动同步至卡券.

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardWechatFieldType.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ public enum CardWechatFieldType {
1414
USER_FORM_INFO_FLAG_IDCARD("身份证"),
1515
USER_FORM_INFO_FLAG_EMAIL("邮箱"),
1616
USER_FORM_INFO_FLAG_LOCATION("详细地址"),
17-
USER_FORM_INFO_FLAG_EDUCATION_BACKGRO("教育背景"),
17+
18+
/**
19+
* 原文档为 USER_FORM_INFO_FLAG_EDUCATION_BACKGRO, 测试不通过,可能是文档错误
20+
*/
21+
USER_FORM_INFO_FLAG_EDUCATION_BACKGROUND("教育背景"),
1822
USER_FORM_INFO_FLAG_INDUSTRY("行业"),
1923
USER_FORM_INFO_FLAG_INCOME("收入"),
2024
USER_FORM_INFO_FLAG_HABIT("兴趣爱好");

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ public class WxDataCubeArticleResult extends WxDataCubeBaseResult {
108108

109109
/**
110110
* user_source
111-
* 在获取图文阅读分时数据时才有该字段,代表用户从哪里进入来阅读该图文。0:会话;1.好友;2.朋友圈;3.腾讯微博;4.历史消息页;5.其他
111+
* 在获取图文统计数据、图文阅读分时数据时才有该字段,代表用户从哪里进入来阅读该图文。
112+
* 99999999.全部;0:会话;1.好友;2.朋友圈;3.腾讯微博;4.历史消息页;5.其他;6.看一看;7.搜一搜;
112113
*/
113114
@SerializedName("user_source")
114115
private Integer userSource;

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.chanjar.weixin.mp.api.impl;
22

3+
import com.google.common.collect.Lists;
34
import com.google.inject.Inject;
45
import me.chanjar.weixin.common.bean.WxCardApiSignature;
56
import me.chanjar.weixin.common.error.WxErrorException;
@@ -134,7 +135,7 @@ public void testCreateGrouponCard() throws WxErrorException {
134135
base.setCustomUrlSubTitle("副标题tip");
135136
base.setPromotionUrlName("更多优惠");
136137
base.setPromotionUrl("http://www.qq.com");
137-
base.setLocationIdList("1234");
138+
base.setLocationIdList(Lists.newArrayList("1234"));
138139

139140
//团购券
140141
WxMpCardCreateRequest grouponMessage = new WxMpCardCreateRequest();

0 commit comments

Comments
 (0)