lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-04-23 23:58:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'wxMenuRule' into develop

Browse Source
This commit is contained in:
Binary Wang 2016-06-18 22:00:22 +08:00
commit 88a7ac3693
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxMenu.java
View File

@ -131,7 +131,7 @@ public class WxMenu implements Serializable {
}
public static class WxMenuRule {
private String groupId;
private String tagId;
private String sex;
private String country;
private String province;
@ -139,12 +139,12 @@ public class WxMenu implements Serializable {
private String clientPlatformType;
private String language;
public String getGroupId() {
return groupId;
public String getTagId() {
return tagId;
}
public void setGroupId(String groupId) {
this.groupId = groupId;
public void setTagId(String tagId) {
this.tagId = tagId;
}
public String getSex() {
@ -198,7 +198,7 @@ public class WxMenu implements Serializable {
@Override
public String toString() {
return "matchrule:{" +
"group_id='" + groupId + '\'' +
"tag_id='" + tagId + '\'' +
", sex='" + sex + '\'' +
", country" + country + '\'' +
", province" + province + '\'' +

2
weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxMenuGsonAdapter.java
View File

@ -62,7 +62,7 @@ public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializ
protected JsonObject convertToJson(WxMenu.WxMenuRule menuRule){
JsonObject matchRule = new JsonObject();
matchRule.addProperty("group_id",menuRule.getGroupId());
matchRule.addProperty("tag_id",menuRule.getTagId());
matchRule.addProperty("sex",menuRule.getSex());
matchRule.addProperty("country",menuRule.getCountry());
matchRule.addProperty("province",menuRule.getProvince());

2
weixin-java-common/src/test/java/me/chanjar/weixin/common/bean/WxMenuTest.java
View File

@ -67,7 +67,7 @@ public class WxMenuTest {
menu.getButtons().add(button1);
WxMenu.WxMenuRule wxMenuRule = new WxMenu.WxMenuRule();
wxMenuRule.setGroupId("2");
wxMenuRule.setTagId("2");
wxMenuRule.setSex("1");
wxMenuRule.setCountry("中国");
wxMenuRule.setProvince("广东");