wechat/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-10-29 01:18:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 #1496 更改卡券接口的门店位置ID字段的类型

Browse Source
This commit is contained in:
S
2020-04-09 13:39:33 +08:00
committed by GitHub
parent a9766960c3
commit 6633ea3ca7
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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不能为空");
}

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

@ -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<String> locationIdList;
/**
* 会员卡是否支持全部门店,填写后商户门店更新时会自动同步至卡券.

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

@ -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<String> locationIdList;
/**
* 会员卡是否支持全部门店,填写后商户门店更新时会自动同步至卡券.

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

@ -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("兴趣爱好");

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

@ -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;

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

@ -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();