From 141a7e29596514e4080e86f54b115f203ede411c Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Sat, 5 Sep 2020 20:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2wxjava=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4roomid=E4=B8=8D=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=AD=A5=E6=97=B6=E5=80=99=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/co/yixiang/modules/wechat/domain/YxWechatLive.java   | 2 +-
 .../yixiang/modules/wechat/service/dto/YxWechatLiveDto.java   | 2 +-
 .../modules/wechat/service/impl/YxWechatLiveServiceImpl.java  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java
index 429f1e3a..92ef41f9 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/domain/YxWechatLive.java
@@ -31,7 +31,7 @@ public class YxWechatLive implements Serializable {
 
     /** 直播间id */
     @TableId(type = IdType.INPUT)
-    private Long roomid;
+    private Long roomId;
 
 
     /** 直播间标题 */
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java
index fef16782..c2aeebe2 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java
@@ -29,7 +29,7 @@ public class YxWechatLiveDto implements Serializable {
     /** 防止精度丢失 */
     @JsonSerialize(using= ToStringSerializer.class)
     @ApiModelProperty(value = "直播间id")
-    private Long roomid;
+    private Long roomId;
 
     private Long id;
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java
index 5c3adfe6..073dd7f7 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java
@@ -103,7 +103,7 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl<YxWechatLiveMapper,
                         ,YxWechatLiveGoodsDto.class);
                 i.setProduct(wechatLiveGoodsDtos);
             }
-            i.setId(i.getRoomid());
+            i.setId(i.getRoomId());
         });
         wechatLiveVo.setContent(liveDtos);
         wechatLiveVo.setTotalElements(page.getTotal());
@@ -120,7 +120,7 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl<YxWechatLiveMapper,
             resources.setShareImg(uploadPhotoToWx(wxMaService,resources.getShareImge()).getMediaId());
             WxMaLiveInfo.RoomInfo roomInfo = generator.convert(resources, WxMaLiveInfo.RoomInfo.class);
             Integer status = wxMaService.getLiveService().createRoom(roomInfo);
-            resources.setRoomid(Long.valueOf(status));
+            resources.setRoomId(Long.valueOf(status));
             if(StringUtils.isNotBlank(resources.getProductId())){
                 String[] productIds = resources.getProductId().split(",");
                 List<Integer> pids = new ArrayList<>();