Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/entity/TaLiveActivity.java

@@ -148,14 +148,18 @@ public class TaLiveActivity implements Serializable {
     @TableField(exist = false)
     private String cityName;
 
+    /**
+     * 直播app名称
+     */
     @TableField(exist = false)
     private String liveAppName;
 
+    /**
+     * 直播app小程序appid
+     */
     @TableField(exist = false)
     private String liveAppAppId;
 
-    @TableField(exist = false)
     private String liveAppPath;
 
-
 }

src/main/java/com/huiju/estateagents/service/impl/TaLiveActivityServiceImpl.java

@@ -70,6 +70,10 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         taLiveActivity.setVisitNum(0);
         taLiveActivity.setCreateDate(LocalDateTime.now());
         taLiveActivity.setUpdateDate(LocalDateTime.now());
+        if (StringUtils.isNotBlank(taLiveActivity.getLiveRoomParam())) {
+            taLiveActivity.setLiveAppName(taLiveActivity.getLiveRoomParam().replace(".html", ""));
+        }
+
         Boolean result = save(taLiveActivity);
         if (!result) {
             responseBean.addError("fail");
@@ -146,7 +150,7 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         tdLiveDictQueryWrapper.eq("id", result.getLiveApp());
         tdLiveDictQueryWrapper.eq("status", "1");
         TdLiveDict tdLiveDict = tdLiveDictMapper.selectOne(tdLiveDictQueryWrapper);
-        if(tdLiveDict == null){
+        if (tdLiveDict == null) {
             responseBean.addSuccess(null);
             return responseBean;
         }