Skip to content

#bugfix#卡券高级信息的商户服务应该为列表 #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binarywang merged 16 commits into from
Aug 30, 2018
Merged

#bugfix#卡券高级信息的商户服务应该为列表 #736

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
29152db
恢复原有的key值
Apr 15, 2018
67277d9
升级3.0.1.01版本
Apr 15, 2018
06f7d36
升级版本
Apr 15, 2018
3c74bb4
增加会员卡创建接口。
Aug 28, 2018
fe75ab3
优化代码，同时增加通过json构建对象方法。
Aug 28, 2018
ca1bc83
升级3.1.7-SNAPSHOT版本
Aug 28, 2018
da297ee
增加直接传入json字符串的原始API
Aug 28, 2018
d75a764
Merge commit 'b3277244339c3f0f06d641f21f2ebdec4b1b6915' into develop
Aug 28, 2018
2ed200c
完善卡券及会员卡相关接口
Aug 29, 2018
b348ece
优化注释
Aug 29, 2018
3f8608a
还原开发分支版本号。
Aug 29, 2018
4910884
Merge branch 'develop' of https://github.com/Wechat-Group/weixin-java…
Aug 29, 2018
33e2d5e
#bugfix#：商户服务不对，应该为字符串列表
Aug 30, 2018
35b7c6f
直接返回消息
Aug 30, 2018
fa6b086
格式化代码。
Aug 30, 2018
6c909f1
格式化代码。
Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
格式化代码。
  • Loading branch information
袁启勋 committed Aug 30, 2018
commit fa6b086fdd784686b152b81d6b8f7273f306f4ed
8 changes: 4 additions & 4 deletions weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,14 @@ private WxMpCardCreateResult validCheck(WxMpMemberCardCreateMessage createMessag

//校验高级信息
AdvancedInfo advancedInfo = memberCard.getAdvancedInfo();
if(advancedInfo != null){
if(advancedInfo.getBusinessServiceList() != null){
for(String bs:advancedInfo.getBusinessServiceList()){
if (advancedInfo != null) {
if (advancedInfo.getBusinessServiceList() != null) {
for (String bs : advancedInfo.getBusinessServiceList()) {
BusinessServiceType businessServiceType = null;
try {
businessServiceType = BusinessServiceType.valueOf(bs);
} catch (IllegalArgumentException ex) {
return WxMpCardCreateResult.failure("会员卡高级信息的商户服务:"+bs+" 不合法");
return WxMpCardCreateResult.failure("会员卡高级信息的商户服务:" + bs + " 不合法");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public class BaseInfo implements Serializable {
* 每人可领券的数量限制,建议会员卡每人限领一张
*/
@SerializedName("get_limit")
private Integer getLimit=1;
private Integer getLimit = 1;

/**
* 卡券领取页面是否可分享,默认为true
Expand Down