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

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

@@ -1,12 +1,8 @@
 package com.huiju.estateagents.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaLiveActivity;
 import com.huiju.estateagents.service.ITaLiveActivityService;
 import org.slf4j.Logger;
@@ -15,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -93,20 +89,11 @@ public class TaLiveActivityController extends BaseController {
      * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value = "/taLiveActivity/{id}", method = RequestMethod.DELETE)
-    public ResponseBean taLiveActivityDelete(@PathVariable Integer id) {
+    @RequestMapping(value = "/taLiveActivity", method = RequestMethod.DELETE)
+    public ResponseBean taLiveActivityDelete(@RequestBody List<TaLiveActivity> taLiveActivity, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            TaLiveActivity taLiveActivity = new TaLiveActivity();
-            taLiveActivity.setLiveActivityId(id);
-            taLiveActivity.setStatus(CommConstant.STATUS_UNACCALIMED);
-            taLiveActivity.setUpdateDate(LocalDateTime.now());
-
-            if (iTaLiveActivityService.updateById(taLiveActivity)) {
-                responseBean.addSuccess("success");
-            } else {
-                responseBean.addError("fail");
-            }
+            responseBean = iTaLiveActivityService.delLiveActivityList(getOrgId(request), taLiveActivity);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taLiveActivityDelete -=- {}", e.toString());

src/main/java/com/huiju/estateagents/mapper/TaLiveActivityMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -28,4 +30,13 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
     Boolean addVisitNum(@Param("id") String id);
 
     IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId")Integer orgId);
+    /**
+     * 批量更新直播活动状态
+     *
+     * @param orgId
+     * @param taLiveActivityList
+     */
+    void updateLiveActivityStatus(@Param("orgId") Integer orgId, @Param("taLiveActivityList") List<TaLiveActivity> taLiveActivityList);
+
+
 }

src/main/java/com/huiju/estateagents/service/ITaLiveActivityService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaLiveActivity;
 
+import java.util.List;
+
 /**
  * <p>
  * 服务类
@@ -54,4 +56,6 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @return
      */
     ResponseBean getLiveActivityDetailById(String id);
+
+    ResponseBean delLiveActivityList(Integer orgId, List<TaLiveActivity> liveActivityList);
 }

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

@@ -283,7 +283,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         String messageType = null == tpl ? CommConstant.MESSAGE_TYPE_OF_SMS :
                 isSubscribe ? CommConstant.MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE : CommConstant.MESSAGE_TYPE_OF_MINIAPP_TEMPLATE;
         if (isSubscribe) {
-            String[] data = new String[]{name, result, programName, failReason, DateUtils.cutSecond(dt)};
+            String[] data = new String[]{name, result, programName, remark, failReason, DateUtils.cutSecond(dt)};
             sendSubscribeMessage(tpl, toUser, link, data);
         }
 

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

@@ -162,4 +162,11 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         responseBean.addSuccess(result);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean delLiveActivityList(Integer orgId, List<TaLiveActivity> liveActivityList) {
+        ResponseBean responseBean = new ResponseBean();
+        taLiveActivityMapper.updateLiveActivityStatus(orgId,liveActivityList);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -9,6 +9,18 @@
             t.live_activity_id = #{id}
     </update>
 
+    <update id ="updateLiveActivityStatus" >
+        UPDATE ta_live_activity t
+            SET t.`status` = 0,
+        t.update_date = CURRENT_TIME
+        WHERE
+        t.org_id = #{orgId}
+	    AND t.live_activity_id in
+        <foreach collection="taLiveActivityList" item="taLiveActivity" open="(" close=")" separator=",">
+            #{taLiveActivity.liveActivityId}
+        </foreach>
+    </update>
+
     <select id="selectLiveListByCondition" resultType="com.huiju.estateagents.entity.TaLiveActivity">
      select a.building_name,b.name as city_name, t.* From ta_live_activity t
      left join ta_building a on t.building_id = a.building_id