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

Merge branch 'fix_data_typo' into develop

Browse Source
This commit is contained in:
Binary Wang
2016-06-18 22:01:35 +08:00
parent 88a7ac3693 52e9b67c0f
commit e492e5adeb
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java
View File

@ -12,7 +12,7 @@ public class WxMpTemplateMessage implements Serializable {
private String templateId; private String templateId;
private String url; private String url;
private String topColor; private String topColor;
private List<WxMpTemplateData> datas = new ArrayList<WxMpTemplateData>(); private List<WxMpTemplateData> data = new ArrayList<WxMpTemplateData>();
public String getToUser() { public String getToUser() {
return toUser; return toUser;
@ -46,12 +46,16 @@ public class WxMpTemplateMessage implements Serializable {
this.topColor = topColor; this.topColor = topColor;
} }
public List<WxMpTemplateData> getDatas() { public List<WxMpTemplateData> getData() {
return datas; return data;
} }
public void setDatas(List<WxMpTemplateData> datas) { public void setData(List<WxMpTemplateData> data) {
this.datas = datas; this.data = data;
}
public void addWxMpTemplateData(WxMpTemplateData datum) {
this.data.add(datum);
} }
public String toJson() { public String toJson() {

14
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpTemplateMessageGsonAdapter.java
View File

@ -30,16 +30,16 @@ public class WxMpTemplateMessageGsonAdapter implements JsonSerializer<WxMpTempla
messageJson.addProperty("topcolor", message.getTopColor()); messageJson.addProperty("topcolor", message.getTopColor());
} }
JsonObject datas = new JsonObject(); JsonObject data = new JsonObject();
messageJson.add("data", datas); messageJson.add("data", data);
for (WxMpTemplateData data : message.getDatas()) { for (WxMpTemplateData datum : message.getData()) {
JsonObject dataJson = new JsonObject(); JsonObject dataJson = new JsonObject();
dataJson.addProperty("value", data.getValue()); dataJson.addProperty("value", datum.getValue());
if (data.getColor() != null) { if (datum.getColor() != null) {
dataJson.addProperty("color", data.getColor()); dataJson.addProperty("color", datum.getColor());
} }
datas.add(data.getName(), dataJson); data.add(datum.getName(), dataJson);
} }
return messageJson; return messageJson;