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());
@@ -127,6 +114,7 @@ public class TaLiveActivityController extends BaseController {
                                              @RequestBody TaLiveActivity taLiveActivity) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            taLiveActivity.setLiveActivityId(id);
             if (iTaLiveActivityService.updateById(taLiveActivity)) {
                 responseBean.addSuccess(taLiveActivity);
             } else {
@@ -145,7 +133,7 @@ public class TaLiveActivityController extends BaseController {
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/taLiveActivity/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/taLiveActivity/{id}", method = RequestMethod.GET)
     public ResponseBean taLiveActivityGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -114,6 +114,30 @@ public class TaSharePersonFromController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 根据id查询对象
+     */
+    @RequestMapping(value="api/admin/taLiveVisit",method= RequestMethod.GET)
+    public ResponseBean taLiveActivityVisit(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value = "sceneType", required = false)String sceneType,
+                                               @RequestParam(value = "personType", required = false)String personType,
+                                               @RequestParam(value = "phone", required = false)String phone,
+                                               @RequestParam(value = "liveActivityId")String liveActivityId, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (liveActivityId == null){
+                return ResponseBean.success("");
+            }
+            responseBean = iTaSharePersonFromService.selectLiveActivityVisitList(pageNum, pageSize, getOrgId(request), personType, sceneType, phone, liveActivityId);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 修改对象
      * @param id  实体ID

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

@@ -92,4 +92,7 @@ public class TaSharePersonFrom implements Serializable {
 
     @TableField(exist = false)
     private String salesBatchName;
+
+    @TableField(exist = false)
+    private String liveActivityTitle;
 }

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/mapper/TaSharePersonFromMapper.java

@@ -19,5 +19,29 @@ import java.util.List;
 @Mapper
 public interface TaSharePersonFromMapper extends BaseMapper<TaSharePersonFrom> {
     Integer countViewNum(@Param("userId") Integer userId, @Param("orgId")Integer orgId, @Param("personId")String personId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
+
+    /**
+     * 查询房源访问记录
+     * @param page
+     * @param orgId
+     * @param personType
+     * @param sceneType
+     * @param phone
+     * @param saleBatchId
+     * @return
+     */
     List<TaSharePersonFrom> selectHouseVisitList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("sceneType")String sceneType, @Param("phone")String phone, @Param("saleBatchId")String saleBatchId);
+
+    /**
+     * 查询直播活动访问记录
+     * @param page
+     * @param orgId
+     * @param personType
+     * @param sceneType
+     * @param phone
+     * @param liveActivityId
+     * @return
+     */
+    List<TaSharePersonFrom> selectLiveActivityVisitList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("sceneType")String sceneType, @Param("phone")String phone, @Param("liveActivityId")String liveActivityId);
+
 }

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/ITaSharePersonFromService.java

@@ -26,4 +26,6 @@ public interface ITaSharePersonFromService extends IService<TaSharePersonFrom> {
     TaSharePersonFrom addSharePersonRecord(String personId, Integer orgId, String from, String recommender, String targetId);
 
     ResponseBean selectHouseVisitList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String sceneType, String phone, String saleBatchId);
+
+    ResponseBean selectLiveActivityVisitList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String sceneType, String phone, String liveActivityId);
 }

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/java/com/huiju/estateagents/service/impl/TaSharePersonFromServiceImpl.java

@@ -43,6 +43,9 @@ public class TaSharePersonFromServiceImpl extends ServiceImpl<TaSharePersonFromM
     @Autowired
     private  TaSalesBatchMapper taSalesBatchMapper;
 
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
     /**
      * 添加客户分享记录
      *
@@ -118,4 +121,17 @@ public class TaSharePersonFromServiceImpl extends ServiceImpl<TaSharePersonFromM
         page.setRecords(list);
         return ResponseBean.success(page);
     }
+
+    @Override
+    public ResponseBean selectLiveActivityVisitList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String sceneType, String phone, String liveActivityId) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaSharePersonFrom> list = taSharePersonFromMapper.selectLiveActivityVisitList(page, orgId, personType, sceneType, phone, liveActivityId);
+        TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(liveActivityId);
+        list.forEach(e -> {
+            e.setLiveActivityTitle(taLiveActivity.getLiveActivityTitle());
+        });
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
 }

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

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -54,4 +54,24 @@
         GROUP BY t.target_id,t.target_type,t.person_id,t.share_person
         order by t.create_date desc
     </select>
+
+    <select id="selectLiveActivityVisitList" resultType="com.huiju.estateagents.entity.TaSharePersonFrom">
+        select c.avatarurl as photoOravatar, c.nickname as nameOrnick, c.name, c.phone, c.person_type as sharePersonType, t.create_date
+        From ta_share_person_from t
+        LEFT JOIN ta_person_from_record a on t.person_id = a.person_id
+        left join ta_person c on t.person_id = c.person_id
+        left join ta_live_activity d on d.live_activity_id = t.target_id
+        where a.org_id = #{orgId}
+        and t.target_type = 'live_share'
+        and t.target_id = #{liveActivityId}
+        <if test="personType != null and personType != ''">
+            and c.person_Type = #{personType}
+        </if>
+        <if test="phone != null and phone != ''">
+            and c.phone = #{phone}
+        </if>
+        and t.share_person != t.person_id
+        GROUP BY t.target_id,t.target_type,t.person_id,t.share_person
+        order by t.create_date desc
+    </select>
 </mapper>