#1110 微信营销回传数据接口新增leads_type参数

Author: binarywang

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMarketingService.java

@@ -61,7 +61,11 @@ public interface WxMpMarketingService {
    * @param endDate   结束日期
    * @param filtering 过滤条件
    * @param page      页码，获取指定页数据
-   * @param page_size 一页获取的数据条数(1-100)
+   * @param pageSize  一页获取的数据条数(1-100)
+   * @return .
+   * @throws WxErrorException .
+   * @throws IOException      .
    */
-  WxMpAdLeadResult getAdLeads(Date beginDate, Date endDate, List<WxMpAdLeadFilter> filtering, Integer page, Integer page_size) throws WxErrorException, IOException;
+  WxMpAdLeadResult getAdLeads(Date beginDate, Date endDate, List<WxMpAdLeadFilter> filtering, Integer page, Integer pageSize)
+    throws WxErrorException, IOException;
 }

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

@@ -54,7 +54,8 @@ public void addUserAction(List<WxMpUserAction> actions) throws WxErrorException
   }
 
   @Override
-  public WxMpAdLeadResult getAdLeads(Date beginDate, Date endDate, List<WxMpAdLeadFilter> filtering, Integer page, Integer pageSize) throws WxErrorException, IOException {
+  public WxMpAdLeadResult getAdLeads(Date beginDate, Date endDate, List<WxMpAdLeadFilter> filtering, Integer page, Integer pageSize)
+    throws WxErrorException, IOException {
     Date today = new Date();
     if (beginDate == null) {
       beginDate = today;
@@ -68,7 +69,7 @@ public WxMpAdLeadResult getAdLeads(Date beginDate, Date endDate, List<WxMpAdLead
     dateRange.addProperty("end_date", DateFormatUtils.format(endDate, "yyyy-MM-dd"));
     params += "&date_range=" + URLEncoder.encode(dateRange.toString(), StandardCharsets.UTF_8.name());
     params += "&page=" + page;
-    params += "&pageSize=" + pageSize;
+    params += "&page_size=" + pageSize;
     if (filtering != null) {
       JsonArray filterJson = new JsonArray();
       for (WxMpAdLeadFilter filter : filtering) {

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/marketing/WxMpUserAction.java

@@ -25,6 +25,7 @@ public class WxMpUserAction implements Serializable {
   private String url;
   private Integer actionTime;
   private String actionType;
+  private String leadsType;
   private String clickId;
   private Integer actionParam;
 
@@ -44,6 +45,7 @@ private JsonObject toJsonObject() {
     if (this.actionParam != null) {
       JsonObject actionParamJson = new JsonObject();
       actionParamJson.addProperty("value", actionParam);
+      actionParamJson.addProperty("leads_type", leadsType);
       json.add("action_param", actionParamJson);
     }