From 1650ee2e205214be28f9bae89bc6be71c95c8f1f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 7 Jul 2020 10:04:17 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=9B=B4=E6=92=AD=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E5=80=BC?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../miniapp/api/impl/WxMaLiveGoodsServiceImpl.java  |  4 +---
 .../binarywang/wx/miniapp/bean/WxMaLiveResult.java  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImpl.java
index 8e6a3f2ca..d819ff805 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveGoodsServiceImpl.java
@@ -9,7 +9,6 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.error.WxError;
@@ -30,8 +29,7 @@ import java.util.Map;
  */
 @AllArgsConstructor
 public class WxMaLiveGoodsServiceImpl implements WxMaLiveGoodsService {
-
-  private WxMaService wxMaService;
+  private final WxMaService wxMaService;
 
   @Override
   public WxMaLiveResult addGoods(WxMaLiveInfo.Goods goods) throws WxErrorException {
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaLiveResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaLiveResult.java
index 2b0407e6a..2040b4a52 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaLiveResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaLiveResult.java
@@ -49,8 +49,16 @@ public class WxMaLiveResult implements Serializable {
     private static final long serialVersionUID = 5769245932149287574L;
     @SerializedName("goods_id")
     private Integer goodsId;
+    /**
+     * 获取商品列表返回的商品图片
+     */
     @SerializedName("cover_img_url")
     private String coverImgUrl;
+    /**
+     * 获取直播间列表返回的商品图片
+     */
+    @SerializedName("cover_img")
+    private String coverImg;
     private String name;
     private String url;
     @SerializedName("price_type")
@@ -76,7 +84,8 @@ public class WxMaLiveResult implements Serializable {
   public static class RoomInfo implements Serializable {
     private static final long serialVersionUID = 7745775280267417154L;
     private String name;
-    private Integer roomid;
+    @SerializedName("roomid")
+    private Integer roomId;
     @SerializedName("cover_img")
     private String coverImg;
     @SerializedName("share_img")
@@ -102,7 +111,7 @@ public class WxMaLiveResult implements Serializable {
     private Integer closeGoods;
     @SerializedName("close_comment")
     private Integer closeComment;
-    private List<WxMaLiveInfo.Goods> goods;
+    private List<Goods> goods;
   }
 
   /**