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

# Conflicts:
#	src/main/resources/mapper/TaLiveActivityMapper.xml

src/main/java/com/huiju/estateagents/common/CommConstant.java

 	public static final Object GROUP_ACTIVITY = "groupActivity";
 	public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    public static final String LIVE_ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/live/index\"}";
     public static final String DRAINAGE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
     public static final String HOUSE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/houseList/index\"}";
     

src/main/java/com/huiju/estateagents/controller/TaLiveActivityController.java

 package com.huiju.estateagents.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.ITaLiveActivityService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
     @Autowired
     public ITaLiveActivityService iTaLiveActivityService;
 
+    @Autowired
+    public IExtendContentService iExtendContentService;
+
     /**
      * 分页查询列表
      *
         ResponseBean responseBean = new ResponseBean();
         try {
             taLiveActivity.setLiveActivityId(id);
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",taLiveActivity.getOrgId());
+            queryWrapper.eq("content_type",CommConstant.LIVE);
+            queryWrapper.eq("target_id",taLiveActivity.getLiveActivityId());
+            List<ExtendContent> list = iExtendContentService.list(queryWrapper);
+            if (CommConstant.NOT_PUBLISH.equals(taLiveActivity.getStatus())){
+                list.forEach(e -> {
+                    e.setStatus(CommConstant.NOT_PUBLISH);
+                });
+            }else{
+                list.forEach(e -> {
+                    e.setStatus(CommConstant.IS_PUBLISH);
+                });
+            }
+            if (list.size() > 0){
+                iExtendContentService.updateBatchById(list);
+            }
+
             if (iTaLiveActivityService.updateById(taLiveActivity)) {
                 responseBean.addSuccess(taLiveActivity);
             } else {

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

     /**
      * 状态
      */
+
     private Integer status;
 
     /**
     /**
      * 直播开始时间
      */
-    private LocalDateTime liveStartDate;
+    private String liveStartDate;
 
     /**
      * 直播结束时间
      */
-    private LocalDateTime liveEndDate;
+    private String liveEndDate;
 
     /**
      * 创建时间
     @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

         taLiveActivity.setVisitNum(0);
         taLiveActivity.setCreateDate(LocalDateTime.now());
         taLiveActivity.setUpdateDate(LocalDateTime.now());
+        if (StringUtils.isNotBlank(taLiveActivity.getLiveRoomParam())) {
+            taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html", ""));
+        }
+
         Boolean result = save(taLiveActivity);
         if (!result) {
             responseBean.addError("fail");
         QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
         taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
         TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
-        /**
-         *  TODO 部分信息待修改
-         */
         ResponseBean taMiniappQrcode = miniAppService.getQrCode
-                (CommConstant.ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
+                (CommConstant.LIVE_ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
                         .replace("#1", "live"), taMiniapp.getMiniappId());
         taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
         updateById(taLiveActivity);
         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;
         }

src/main/resources/mapper/TaLiveActivityMapper.xml

      left join ta_building a on t.building_id = a.building_id
      LEFT JOIN td_city b on t.city_id = b.id
      where t.org_id = #{orgId} and t.status != -1
-     <if test="status != null and status != ''">
+     <if test="status != null">
          and t.status = #{status}
      </if>
      <if test="liveActivityTitle != null and liveActivityTitle != ''">
             #{personBuilding.buildingId}
         </foreach>
     </if>
+        order by t.weight desc
     </select>
 
 </mapper>