Pārlūkot izejas kodu

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

weichaochao 5 gadus atpakaļ
vecāks
revīzija
bf7efa4f3d

+ 6
- 2
src/main/java/com/huiju/estateagents/entity/TaLiveActivity.java Parādīt failu

148
     @TableField(exist = false)
148
     @TableField(exist = false)
149
     private String cityName;
149
     private String cityName;
150
 
150
 
151
+    /**
152
+     * 直播app名称
153
+     */
151
     @TableField(exist = false)
154
     @TableField(exist = false)
152
     private String liveAppName;
155
     private String liveAppName;
153
 
156
 
157
+    /**
158
+     * 直播app小程序appid
159
+     */
154
     @TableField(exist = false)
160
     @TableField(exist = false)
155
     private String liveAppAppId;
161
     private String liveAppAppId;
156
 
162
 
157
-    @TableField(exist = false)
158
     private String liveAppPath;
163
     private String liveAppPath;
159
 
164
 
160
-
161
 }
165
 }

+ 5
- 1
src/main/java/com/huiju/estateagents/service/impl/TaLiveActivityServiceImpl.java Parādīt failu

70
         taLiveActivity.setVisitNum(0);
70
         taLiveActivity.setVisitNum(0);
71
         taLiveActivity.setCreateDate(LocalDateTime.now());
71
         taLiveActivity.setCreateDate(LocalDateTime.now());
72
         taLiveActivity.setUpdateDate(LocalDateTime.now());
72
         taLiveActivity.setUpdateDate(LocalDateTime.now());
73
+        if (StringUtils.isNotBlank(taLiveActivity.getLiveRoomParam())) {
74
+            taLiveActivity.setLiveAppName(taLiveActivity.getLiveRoomParam().replace(".html", ""));
75
+        }
76
+
73
         Boolean result = save(taLiveActivity);
77
         Boolean result = save(taLiveActivity);
74
         if (!result) {
78
         if (!result) {
75
             responseBean.addError("fail");
79
             responseBean.addError("fail");
146
         tdLiveDictQueryWrapper.eq("id", result.getLiveApp());
150
         tdLiveDictQueryWrapper.eq("id", result.getLiveApp());
147
         tdLiveDictQueryWrapper.eq("status", "1");
151
         tdLiveDictQueryWrapper.eq("status", "1");
148
         TdLiveDict tdLiveDict = tdLiveDictMapper.selectOne(tdLiveDictQueryWrapper);
152
         TdLiveDict tdLiveDict = tdLiveDictMapper.selectOne(tdLiveDictQueryWrapper);
149
-        if(tdLiveDict == null){
153
+        if (tdLiveDict == null) {
150
             responseBean.addSuccess(null);
154
             responseBean.addSuccess(null);
151
             return responseBean;
155
             return responseBean;
152
         }
156
         }