Merge branch 'dev'

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.10</version>
+	<version>v3.5.11</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -18,89 +18,95 @@ import java.util.Map;
  * @date 2018-12-18
  */
 public class BaseController {
-	@Autowired
-	private ITaUserService taUserService;
-
-	@Autowired
-	private ITaPersonBuildingService taPersonBuildingService;
-
-	/**
-	 * 获取orgId
-	 * @param request
-	 * @return
-	 */
-	public Integer getOrgId(HttpServletRequest request){
-		
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("orgId")){
-			return Integer.valueOf(map.get("orgId").toString());
-		}
-		
-		return null;
-	}
-
-	public Integer getChannelId(HttpServletRequest request){
-
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("channelId")){
-			return Integer.valueOf(map.get("channelId").toString());
-		}
-
-		return null;
-	}
-
-	public String getChannelUserName(HttpServletRequest request){
-
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("userName")){
-			return map.get("userName").toString();
-		}
-
-		return null;
-	}
-
-	public String getOpenId(HttpServletRequest request){
-
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("openId")){
-			return map.get("openId").toString();
-		}
-
-		return null;
-	}
-
-	public String getPersonId(HttpServletRequest request){
-
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("personId")){
-			return map.get("personId").toString();
-		}
-
-		return null;
-	}
-	/**
-	 * 获取orgId
-	 * @param request
-	 * @return
-	 */
-	public Integer getUserId(HttpServletRequest request){
-		
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("userId")){
-			return Integer.valueOf(map.get("userId").toString());
-		}
-		
-		return null;
-	}
-
-	public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
-		TaUser taUser = taUserService.getById(getUserId(request));
-		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
-		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
-		List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
-		if (null != taUser.getIsAdmin() && taUser.getIsAdmin()){
-			taPersonBuildingList = new ArrayList<>();
-		}
-		return taPersonBuildingList;
-	}
+    @Autowired
+    private ITaUserService taUserService;
+
+    @Autowired
+    private ITaPersonBuildingService taPersonBuildingService;
+
+    /**
+     * 获取orgId
+     *
+     * @param request
+     * @return
+     */
+    public Integer getOrgId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("orgId")) {
+            return Integer.valueOf(map.get("orgId").toString());
+        }
+
+        return null;
+    }
+
+    public Integer getChannelId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("channelId")) {
+            return Integer.valueOf(map.get("channelId").toString());
+        }
+
+        return null;
+    }
+
+    public String getChannelUserName(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userName")) {
+            return map.get("userName").toString();
+        }
+
+        return null;
+    }
+
+    public String getOpenId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("openId")) {
+            return map.get("openId").toString();
+        }
+
+        return null;
+    }
+
+    public String getPersonId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("personId")) {
+            return map.get("personId").toString();
+        }
+
+        return null;
+    }
+
+    /**
+     * 获取orgId
+     *
+     * @param request
+     * @return
+     */
+    public Integer getUserId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userId")) {
+            return Integer.valueOf(map.get("userId").toString());
+        }
+
+        return null;
+    }
+
+    public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
+        TaUser taUser = taUserService.getById(getUserId(request));
+        if (taUser == null) {
+            return null;
+        }
+        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+        if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
+            taPersonBuildingList = new ArrayList<>();
+        }
+        return taPersonBuildingList;
+    }
 }

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

@@ -440,6 +440,7 @@ public class CommConstant {
 	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\"}";
     
@@ -460,6 +461,12 @@ public class CommConstant {
      * 必须存在表   td_miniapp_template_type 中
      */
     public static final String MESSAGE_CONTENT_OF_GROUP = "group-result";
+
+    /**
+     * 审核通知  预选/认筹
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTENT_OF_HOUSE = "house";
     
     /**
      * 活动以结束
@@ -523,6 +530,16 @@ public class CommConstant {
      */
     public static final String HOUSE = "house";
 
+    /**
+     * 批量销售
+     */
+    public static final String SALES_BATCH = "salesBatch";
+
+    /**
+     * 直播分享
+     */
+    public static final String LIVE = "live";
+
     /**
      * 系统参数  通知消息次时间间隔
      */
@@ -558,6 +575,12 @@ public class CommConstant {
      */
     public static final String LOGIN_TYPE_CHANNEL = "channel";
 
+    /**
+     * 登录业务端系统类型
+     */
+    public static final String LOGIN_TYPE_ADMIN = "admin";
+
+
     /**
      * 登录中心端系统类型
      */
@@ -609,4 +632,9 @@ public class CommConstant {
     public static final String SUFFIX_2003 = ".xls";
     public static final String SUFFIX_2007 = ".xlsx";
 
+    /**
+     * 小程序房源详情路径
+     */
+    public static final String HOUSE_DETAIL_PATH = "onlineSelling/pages/detail/index?id=%s";
+
 }

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

@@ -286,7 +286,12 @@ public class TaHousingResourcesController extends BaseController {
                                              @RequestParam(value = "personId") String personId) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.getHousingDetailById(personId, houseId));
+            TaHousingResourcesPO taHousingResourcesPO = iTaHousingResourcesService.getHousingDetailById(personId, houseId);
+            if (taHousingResourcesPO.getStatus() != null && taHousingResourcesPO.getStatus() == CommConstant.STATUS_NORMAL){
+                responseBean.addSuccess(taHousingResourcesPO);
+                return responseBean;
+            }
+            responseBean.addError("当前房源已下架");
         } catch (Exception e) {
             logger.error("getHousingDetailById -=- {}", e);
             responseBean.addError(e.getMessage());

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

@@ -0,0 +1,268 @@
+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.common.StringUtils;
+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.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+@RestController
+@RequestMapping("/api")
+public class TaLiveActivityController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaLiveActivityController.class);
+
+    @Autowired
+    public ITaLiveActivityService iTaLiveActivityService;
+
+    @Autowired
+    public IExtendContentService iExtendContentService;
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param liveActivityTitle 直播活动标题
+     * @param cityId            所属城市
+     * @param buildingId        所属楼盘
+     * @param liveDetailType    详情类型 0是模板，1是自定义
+     * @param status            状态
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/taLiveActivity", method = RequestMethod.GET)
+    public ResponseBean taLiveActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           String liveActivityTitle, String cityId, String buildingId, Integer status,
+                                           HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request));
+            responseBean.addSuccess(result);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taLiveActivityList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taLiveActivity 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taLiveActivity", method = RequestMethod.POST)
+    public ResponseBean taLiveActivityAdd(@RequestBody TaLiveActivity taLiveActivity, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            Integer userId = getUserId(request);
+            taLiveActivity.setOrgId(orgId);
+            taLiveActivity.setCreateUser(userId.toString());
+            taLiveActivity.setUpdateUser(userId.toString());
+            responseBean = iTaLiveActivityService.taLiveActivityAdd(taLiveActivity);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taLiveActivityAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/delTaLiveActivity", method = RequestMethod.PUT)
+    public ResponseBean taLiveActivityDelete(@RequestBody List<TaLiveActivity> taLiveActivity, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<Integer> liveActivityIds = new ArrayList<>();
+            for (TaLiveActivity activity : taLiveActivity) {
+                liveActivityIds.add(activity.getLiveActivityId());
+            }
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("content_type", CommConstant.LIVE);
+            queryWrapper.in("target_id", liveActivityIds);
+            List<ExtendContent> list = iExtendContentService.list(queryWrapper);
+            list.forEach(e -> {
+                e.setStatus(CommConstant.NOT_PUBLISH);
+            });
+            if (list.size() > 0) {
+                iExtendContentService.updateBatchById(list);
+            }
+
+            responseBean = iTaLiveActivityService.delLiveActivityList(getOrgId(request), taLiveActivity);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taLiveActivityDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id             实体ID
+     * @param taLiveActivity 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taLiveActivity/{id}", method = RequestMethod.PUT)
+    public ResponseBean taLiveActivityUpdate(@PathVariable Integer id,
+                                             @RequestBody TaLiveActivity taLiveActivity, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taLiveActivity.setLiveActivityId(id);
+            taLiveActivity.setUpdateUser(getUserId(request).toString());
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+            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);
+                });
+            }
+            if (list.size() > 0) {
+                iExtendContentService.updateBatchById(list);
+            }
+
+            if(!StringUtils.isEmpty(taLiveActivity.getLiveRoomParam())){
+                taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html",""));
+            }
+
+            if (iTaLiveActivityService.updateById(taLiveActivity)) {
+                responseBean.addSuccess(taLiveActivity);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taLiveActivityUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/admin/taLiveActivity/{id}", method = RequestMethod.GET)
+    public ResponseBean taLiveActivityGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaLiveActivityService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taLiveActivityDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 访问量自增
+     *
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/wx/addVisitNum", method = RequestMethod.PUT)
+    public ResponseBean addVisitNum(@RequestParam("id") String id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaLiveActivityService.addVisitNum(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("addVisitNum -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取直播详情
+     *
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/wx/taLiveActivity/{id}", method = RequestMethod.GET)
+    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaLiveActivityService.getLiveActivityDetailById(id, getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("getLiveActivityDetailById -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param liveActivityTitle 直播活动标题
+     * @param cityId            所属城市
+     * @param buildingId        所属楼盘
+     * @param status            状态
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/taLiveActivity", method = RequestMethod.GET)
+    public ResponseBean taLiveActivityListForMiniApp(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                     String liveActivityTitle, String cityId, String buildingId, Integer status,
+                                                     HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            status = status == null ? 1 : status;
+            Integer orgId = getOrgId(request);
+            IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
+                    liveActivityTitle, cityId, buildingId, status, null);
+            responseBean.addSuccess(result);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taLiveActivityListForMiniApp -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -28,8 +28,8 @@ import java.util.Map;
 
 /**
  * <p>
-    *   前端控制器
-    * </p>
+ * 前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-07-23
@@ -62,34 +62,36 @@ public class TaPersonVisitRecordController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPersonVisitRecord",method= RequestMethod.GET)
-    public ResponseBean taPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/taPersonVisitRecord", method = RequestMethod.GET)
+    public ResponseBean taPersonVisitRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
             //使用分页插件
-		    IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPersonVisitRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.page(pg, queryWrapper);
             return ResponseBean.success(result);
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 保存对象--埋点数据保存
+     *
      * @param taPersonVisitRecord 实体对象
      * @return
      */
-    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
-    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
+    @RequestMapping(value = "/wx/taPersonVisitRecord", method = RequestMethod.POST)
+    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request) {
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -98,8 +100,8 @@ public class TaPersonVisitRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
         taPersonVisitRecord.setOrgId(String.valueOf(getOrgId(request)));
-        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity(), getOrgId(request));
-        if(eventProperties<=0){
+        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(), taPersonVisitRecord.getEventType(), taPersonVisitRecord.getActivity(), getOrgId(request));
+        if (eventProperties <= 0) {
             TaEventProperties taEventProperty = new TaEventProperties();
             taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
             taEventProperty.setCreateDate(LocalDateTime.now());
@@ -109,21 +111,21 @@ public class TaPersonVisitRecordController extends BaseController {
             taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
             taEventProperty.setEventType(taPersonVisitRecord.getEventType());
             taEventProperty.setOrgId(getOrgId(request));
-            if (!taEventPropertiesService.save(taEventProperty)){
-                return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
+            if (!taEventPropertiesService.save(taEventProperty)) {
+                return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
             }
 
         }
 
         taPersonVisitRecord.setPersonId(person.getPersonId());
         taPersonVisitRecord.setVisitTime(LocalDateTime.now());
-        if(!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())){
+        if (!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())) {
             QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
-            intentionQueryWrapper.eq("building_id",taPersonVisitRecord.getBuildingId());
+            intentionQueryWrapper.eq("building_id", taPersonVisitRecord.getBuildingId());
             intentionQueryWrapper.eq("org_id", getOrgId(request));
-            intentionQueryWrapper.eq("event_code",taPersonVisitRecord.getEvent());
-            List<TaBuildingIntention>list = buildingIntentionService.list(intentionQueryWrapper);
-            if (list.size()>0){
+            intentionQueryWrapper.eq("event_code", taPersonVisitRecord.getEvent());
+            List<TaBuildingIntention> list = buildingIntentionService.list(intentionQueryWrapper);
+            if (list.size() > 0) {
                 TaBuildingIntention buildingIntention = list.get(0);
                 TaPersonIntentionRecord intentionRecord = new TaPersonIntentionRecord();
                 TaBuilding building = buildingService.getById(buildingIntention.getBuildingId());
@@ -138,119 +140,123 @@ public class TaPersonVisitRecordController extends BaseController {
                 intentionRecord.setPersonId(person.getPersonId());
                 intentionRecord.setPersonName(person.getNickname());
                 intentionRecord.setStatus(CommConstant.STATUS_NORMAL);
-                if (!personIntentionRecordService.save(intentionRecord)){
-                    return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
+                if (!personIntentionRecordService.save(intentionRecord)) {
+                    return ResponseBean.error("新增失败", ResponseBean.ERROR_UNAVAILABLE);
                 }
             }
         }
         try {
-            if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
+            if (iTaPersonVisitRecordService.save(taPersonVisitRecord)) {
                 //清洗埋點數據到新增用戶表--只有进入小程序的时候 start才记录
-                if(taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)){
+                if (taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)) {
                     iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
                 }
 
                 return ResponseBean.success(taPersonVisitRecord);
-            }else {
-                return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
+            } else {
+                return ResponseBean.error("保存失败", ResponseBean.ERROR_UNAVAILABLE);
             }
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordAdd -=- {}",e.toString());
-            return ResponseBean.error("系统异常"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordAdd -=- {}", e.toString());
+            return ResponseBean.error("系统异常" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taPersonVisitRecord/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taPersonVisitRecordDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taPersonVisitRecord/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taPersonVisitRecordDelete(@PathVariable Integer id) {
         try {
-            if(iTaPersonVisitRecordService.removeById(id)){
+            if (iTaPersonVisitRecordService.removeById(id)) {
                 return ResponseBean.success("success");
-            }else {
-                return ResponseBean.error("删除失败",ResponseBean.ERROR_UNAVAILABLE);
+            } else {
+                return ResponseBean.error("删除失败", ResponseBean.ERROR_UNAVAILABLE);
             }
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
-            return ResponseBean.error("保存失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordDelete -=- {}", e.toString());
+            return ResponseBean.error("保存失败" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      * @return
      */
-    @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
-    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id){
+    @RequestMapping(value = "/wx/taPersonVisitRecord/{id}", method = RequestMethod.PUT)
+    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id) {
         TaPersonVisitRecord taPersonVisitRecord = iTaPersonVisitRecordService.getById(id);
-        if(null == taPersonVisitRecord){
-            return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
+        if (null == taPersonVisitRecord) {
+            return ResponseBean.error("更新失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
         taPersonVisitRecord.setRecordId(id);
-        Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
+        Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond() - taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
         taPersonVisitRecord.setVisitDuration(duation.intValue());
         try {
-            if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)){
+            if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)) {
                 return ResponseBean.success(taPersonVisitRecord);
-            }else {
-                return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
+            } else {
+                return ResponseBean.error("更新失败", ResponseBean.ERROR_UNAVAILABLE);
             }
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordUpdate -=- {}",e.toString());
-            return ResponseBean.error("更新失败"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordUpdate -=- {}", e.toString());
+            return ResponseBean.error("更新失败" + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taPersonVisitRecord/{id}",method= RequestMethod.GET)
-    public ResponseBean taPersonVisitRecordGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taPersonVisitRecord/{id}", method = RequestMethod.GET)
+    public ResponseBean taPersonVisitRecordGet(@PathVariable Integer id) {
         try {
             return ResponseBean.success(iTaPersonVisitRecordService.getById(id));
-        }catch (Exception e){
-            logger.error("taPersonVisitRecordDelete -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        } catch (Exception e) {
+            logger.error("taPersonVisitRecordDelete -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 盘客工具分页获取访问记录
+     *
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.GET)
-    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value = "customerId") String customerId){
+    @RequestMapping(value = "/wx/taPersonVisitRecord", method = RequestMethod.GET)
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "customerId") String customerId) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
-    @RequestMapping(value="/admin/taDrainageVisitRecord", method = RequestMethod.GET)
-    public ResponseBean drainageVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value ="activityName",required = false) String activityName,
-                                                @RequestParam(value ="buildingId",required = false) String buildingId,
-                                                @RequestParam(value ="shareName",required = false) String shareName,
-                                                @RequestParam(value ="shareTel",required = false) String shareTel,
-                                                @RequestParam(value ="eventType",required = false) String eventType,
-                                                @RequestParam(value ="personType",required = false) String personType,
+    @RequestMapping(value = "/admin/taDrainageVisitRecord", method = RequestMethod.GET)
+    public ResponseBean drainageVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "activityName", required = false) String activityName,
+                                                @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "shareName", required = false) String shareName,
+                                                @RequestParam(value = "shareTel", required = false) String shareTel,
+                                                @RequestParam(value = "eventType", required = false) String eventType,
+                                                @RequestParam(value = "personType", required = false) String personType,
                                                 HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -267,88 +273,92 @@ public class TaPersonVisitRecordController extends BaseController {
 
     /**
      * 个人中心访客记录分页查询
+     *
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/wx/visitRecord",method= RequestMethod.GET)
-    public ResponseBean getWxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                          @RequestParam(value = "userId") Integer userId,HttpServletRequest request){
+    @RequestMapping(value = "/wx/visitRecord", method = RequestMethod.GET)
+    public ResponseBean getWxVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value = "userId") Integer userId, HttpServletRequest request) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request));
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId, getOrgId(request));
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 个人中心访客记录单个人员的所有活动
+     *
      * @return
      */
-    @RequestMapping(value="/wx/visitRecord/activity",method= RequestMethod.GET)
-    public ResponseBean wxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+    @RequestMapping(value = "/wx/visitRecord/activity", method = RequestMethod.GET)
+    public ResponseBean wxVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                           @RequestParam(value = "userId") Integer userId,
                                           @RequestParam(value = "personId") String personId,
-                                          HttpServletRequest request){
+                                          HttpServletRequest request) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordActivityList(pg, userId,personId,getOrgId(request));
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordActivityList(pg, userId, personId, getOrgId(request));
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 个人中心访客记录分页查询
+     *
      * @param pageNumber
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/wx/activityVisitRecord",method= RequestMethod.GET)
-    public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value = "userId") Integer userId,
-                                                @RequestParam(value = "targetId")String targetId,
-                                                @RequestParam(value = "eventType")String eventType,
-                                                HttpServletRequest request){
+    @RequestMapping(value = "/wx/activityVisitRecord", method = RequestMethod.GET)
+    public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                        @RequestParam(value = "userId") Integer userId,
+                                                        @RequestParam(value = "targetId") String targetId,
+                                                        @RequestParam(value = "eventType") String eventType,
+                                                        HttpServletRequest request) {
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, userId,getOrgId(request),targetId, eventType);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, userId, getOrgId(request), targetId, eventType);
             return ResponseBean.success(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            logger.error("taPersonVisitRecordList -=- {}", e.toString());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 置业顾问分享项目、活动、资讯、助力、拼团信息
+     *
      * @param pageNumber
      * @param pageSize
      * @param userId
      * @param request
      * @return
      */
-    @RequestMapping(value = "/wx/shareRecords",method= RequestMethod.GET)
-    public ResponseBean wxShareRecordsByUserId(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                              @RequestParam(value = "userId") Integer userId,
-                                              HttpServletRequest request){
+    @RequestMapping(value = "/wx/shareRecords", method = RequestMethod.GET)
+    public ResponseBean wxShareRecordsByUserId(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value = "userId") Integer userId,
+                                               HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        if (userId == null){
+        if (userId == null) {
             return responseBean;
         }
         //使用分页插件
@@ -359,9 +369,9 @@ public class TaPersonVisitRecordController extends BaseController {
         IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
-        taConsultantInfos.forEach(e ->{
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType())  + "_share");
-            switch (e.getEventType()){
+        taConsultantInfos.forEach(e -> {
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType()) + "_share");
+            switch (e.getEventType()) {
                 case CommConstant.FAVOR_ACTIVITY:
                     e.setActivityShareNum(shareNum);
                     break;
@@ -383,6 +393,9 @@ public class TaPersonVisitRecordController extends BaseController {
                 case CommConstant.HOUSE:
                     e.setHouseShareNum(shareNum);
                     break;
+                case CommConstant.LIVE:
+                    e.setLiveShareNum(shareNum);
+                    break;
             }
         });
         result.setRecords(taConsultantInfos);

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

@@ -6,13 +6,8 @@ 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.TaMiniapp;
-import com.huiju.estateagents.entity.TaSalesBatch;
-import com.huiju.estateagents.entity.TaShareContent;
-import com.huiju.estateagents.service.IMiniAppService;
-import com.huiju.estateagents.service.ITaMiniappService;
-import com.huiju.estateagents.service.ITaSalesBatchService;
-import com.huiju.estateagents.service.TaShareContentService;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.service.*;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,6 +17,7 @@ import sun.misc.Request;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -50,6 +46,9 @@ public class TaSalesBatchController extends BaseController {
     @Autowired
     private TaShareContentService taShareContentService;
 
+    @Autowired
+    public IExtendContentService iExtendContentService;
+
     /**
      * 分页查询列表
      *
@@ -68,7 +67,7 @@ public class TaSalesBatchController extends BaseController {
             //使用分页插件
             IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
 
-            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request));
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request),getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
         } catch (Exception e) {
             e.printStackTrace();
@@ -109,8 +108,8 @@ public class TaSalesBatchController extends BaseController {
             shareContent.setTargetId(taSalesBatch.getSalesBatchId().toString());
             shareContent.setShareContentTitle("诚挚邀您在线选房购房~");
             shareContent.setShareContentImg(taSalesBatch.getAerialViewImg());
-            shareContent.setShareContentType("house");
-            shareContent.setStatus(1);
+            shareContent.setShareContentType(CommConstant.HOUSE);
+            shareContent.setStatus(CommConstant.STATUS_NORMAL);
             shareContent.setCreateDate(LocalDateTime.now());
             taShareContentService.save(shareContent);
 
@@ -133,6 +132,22 @@ public class TaSalesBatchController extends BaseController {
     public ResponseBean taSalesBatchDel(@RequestBody List<TaSalesBatch> salesBatchs, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            List<Integer> liveActivityIds = new ArrayList<>();
+            for(TaSalesBatch taSalesBatch : salesBatchs){
+                liveActivityIds.add(taSalesBatch.getSalesBatchId());
+            }
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
+            queryWrapper.in("target_id",liveActivityIds);
+            List<ExtendContent> list = iExtendContentService.list(queryWrapper);
+            list.forEach(e -> {
+                e.setStatus(CommConstant.NOT_PUBLISH);
+            });
+            if (list.size() > 0){
+                iExtendContentService.updateBatchById(list);
+            }
+
             responseBean = iTaSalesBatchService.delSalesBatchList(getOrgId(request), salesBatchs);
         } catch (Exception e) {
             e.printStackTrace();
@@ -174,10 +189,25 @@ public class TaSalesBatchController extends BaseController {
      */
     @RequestMapping(value = "/admin/taSalesBatch/{id}", method = RequestMethod.PUT)
     public ResponseBean taSalesBatchUpdate(@PathVariable Integer id,
-                                           @RequestBody TaSalesBatch taSalesBatch) {
+                                           @RequestBody TaSalesBatch taSalesBatch, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taSalesBatch.setSalesBatchId(id);
+
+            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("content_type",CommConstant.SALES_BATCH);
+            queryWrapper.eq("target_id",taSalesBatch.getSalesBatchId());
+            List<ExtendContent> list = iExtendContentService.list(queryWrapper);
+            if (CommConstant.NOT_PUBLISH.equals(taSalesBatch.getStatus())){
+                list.forEach(e -> {
+                    e.setStatus(CommConstant.NOT_PUBLISH);
+                });
+            }
+            if (list.size() > 0){
+                iExtendContentService.updateBatchById(list);
+            }
+
             if (iTaSalesBatchService.updateById(taSalesBatch)) {
                 responseBean.addSuccess(taSalesBatch);
             } else {

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

@@ -47,6 +47,7 @@ public class TaShareController extends BaseController {
 
     /**
      * 确认分享, 送积分
+     *
      * @param typeOf
      * @param id
      * @param request
@@ -61,21 +62,42 @@ public class TaShareController extends BaseController {
     }
 
     @RequestMapping(value = "/admin/taHouseShare", method = RequestMethod.GET)
-    public ResponseBean taHouseShareList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value = "shareType", required = false)String shareType,
-                                         @RequestParam(value = "personType", required = false)String personType,
-                                         @RequestParam(value = "phone", required = false)String phone,
-                                         @RequestParam(value = "salesBatchId")Integer salesBatchId, HttpServletRequest request){
+    public ResponseBean taHouseShareList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "shareType", required = false) String shareType,
+                                         @RequestParam(value = "personType", required = false) String personType,
+                                         @RequestParam(value = "phone", required = false) String phone,
+                                         @RequestParam(value = "salesBatchId") Integer salesBatchId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (salesBatchId == null){
+            if (salesBatchId == null) {
                 return ResponseBean.success("");
             }
             responseBean = taShareService.selectHouseShareList(pageNum, pageSize, getOrgId(request), personType, shareType, phone, salesBatchId);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taShareCountList -=- {}",e.toString());
+            logger.error("taShareCountList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/taLiveShare", method = RequestMethod.GET)
+    public ResponseBean listLiveShare(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                      @RequestParam(value = "shareType", required = false) String shareType,
+                                      @RequestParam(value = "personType", required = false) String personType,
+                                      @RequestParam(value = "phone", required = false) String phone,
+                                      @RequestParam(value = "liveActivityId") Integer liveActivityId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (liveActivityId == null) {
+                return ResponseBean.success("");
+            }
+            responseBean = taShareService.listLiveShare(pageNum, pageSize, getOrgId(request), personType, shareType, phone, liveActivityId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("listLiveShare -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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/controller/TdLiveDictController.java

@@ -0,0 +1,144 @@
+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.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdLiveDict;
+import com.huiju.estateagents.service.ITdLiveDictService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+@RestController
+@RequestMapping("/api")
+public class TdLiveDictController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdLiveDictController.class);
+
+    @Autowired
+    public ITdLiveDictService iTdLiveDictService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/tdLiveDict",method= RequestMethod.GET)
+    public ResponseBean tdLiveDictList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdLiveDict> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdLiveDict> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status",1);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TdLiveDict> result = iTdLiveDictService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdLiveDictList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdLiveDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdLiveDict",method= RequestMethod.POST)
+    public ResponseBean tdLiveDictAdd(@RequestBody TdLiveDict tdLiveDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdLiveDictService.save(tdLiveDict)){
+                responseBean.addSuccess(tdLiveDict);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdLiveDictAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdLiveDict/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdLiveDictDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdLiveDictService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdLiveDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdLiveDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdLiveDict/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdLiveDictUpdate(@PathVariable Integer id,
+                                        @RequestBody TdLiveDict tdLiveDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdLiveDictService.updateById(tdLiveDict)){
+                responseBean.addSuccess(tdLiveDict);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdLiveDictUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdLiveDict/{id}",method= RequestMethod.GET)
+    public ResponseBean tdLiveDictGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdLiveDictService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdLiveDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -287,6 +287,12 @@ public class TaBuilding implements Serializable {
     @TableField(exist = false)
     private List<TaShareActivity> shareActivityList;
 
+    /**
+     * 拼团活动
+     */
+    @TableField(exist = false)
+    private List<TaLiveActivity> liveActivityList;
+
     /**
      * 列表图
      */

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

@@ -37,4 +37,6 @@ public class TaConsultantInfo {
     private Integer buildingTypeId;
 
     private String priceType;
+
+    private Integer liveShareNum;
 }

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

@@ -0,0 +1,170 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaLiveActivity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 直播活动id
+     */
+    @TableId(value = "live_activity_id", type = IdType.AUTO)
+    private Integer liveActivityId;
+
+    /**
+     * 直播活动标题
+     */
+    private String liveActivityTitle;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 所属城市
+     */
+    @TableField(strategy = FieldStrategy.IGNORED)
+    private Integer cityId;
+
+    /**
+     * 所属楼盘
+     */
+    @TableField(strategy = FieldStrategy.IGNORED)
+    private String buildingId;
+
+    /**
+     * 直播小程序
+     */
+    private String liveApp;
+
+    /**
+     * 房间参数
+     */
+    private String liveRoomParam;
+
+    /**
+     * 封面图1
+     */
+    private String listImg;
+
+    /**
+     * 封面图2
+     */
+    private String detailImg;
+
+    /**
+     * 详情类型 0是模板，1是自定义
+     */
+    private String liveDetailType;
+
+    /**
+     * 详情图
+     */
+    private String detailTypeImg;
+
+    /**
+     * 访问人数
+     */
+    private Integer visitNum;
+
+    /**
+     * 状态
+     */
+
+    private Integer status;
+
+    /**
+     * 二维码
+     */
+    private String qrCode;
+
+    /**
+     * 直播开始时间
+     */
+    private String liveStartDate;
+
+    /**
+     * 直播结束时间
+     */
+    private String liveEndDate;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 修改人
+     */
+    private String updateUser;
+
+    /**
+     * 权重
+     */
+    private Integer weight;
+
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
+
+    @TableField(exist = false)
+    private String buildingName;
+
+    @TableField(exist = false)
+    private String cityName;
+
+    /**
+     * 直播app名称
+     */
+    @TableField(exist = false)
+    private String liveAppName;
+
+    /**
+     * 直播app小程序appid
+     */
+    @TableField(exist = false)
+    private String liveAppAppId;
+
+    private String liveAppPath;
+
+    @TableField(exist = false)
+    private String createName;
+
+    @TableField(exist = false)
+    private String updateName;
+}

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

@@ -96,4 +96,16 @@ public class TaShare implements Serializable {
      */
     @TableField(exist = false)
     private String salesBatchName;
+
+    /**
+     * 分享内容
+     */
+    @TableField(exist = false)
+    private String shareContent;
+
+    /**
+     * 直播活动名称
+     */
+    @TableField(exist = false)
+    private String liveActivityTitle;
 }

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/entity/TdLiveDict.java

@@ -0,0 +1,46 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdLiveDict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 直播平台名称
+     */
+    private String livePlatName;
+
+    /**
+     * 直播平台id
+     */
+    private String livePlatValue;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -50,7 +50,7 @@ public class AccessInterceptor implements HandlerInterceptor {
     
     private String[] whiteList = {
             "/wx/chat", // 聊天暂时不鉴权
-            "/api/wx/",
+            "/api/wx/login",
             "/api/wx/tdCity",
             "/api/wx/preload",
             "/api/admin/signin",

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

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+@Mapper
+@Component
+public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
+
+    /**
+     * 访问人数自增
+     *
+     * @param id
+     * @return
+     */
+    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("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    /**
+     * 批量更新直播活动状态
+     *
+     * @param orgId
+     * @param taLiveActivityList
+     */
+    void updateLiveActivityStatus(@Param("orgId") Integer orgId, @Param("taLiveActivityList") List<TaLiveActivity> taLiveActivityList);
+
+
+}

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaSalesBatch;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @Mapper
 public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
-    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList")  List<TaPersonBuilding> personBuildingList);
 
     /**
      * 根据批次号统计预选数据

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

@@ -19,4 +19,6 @@ import java.util.List;
 @Mapper
 public interface TaShareMapper extends BaseMapper<TaShare> {
     List<TaShare> selectHouseShareList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("saleBatchId")Integer saleBatchId);
+
+    List<TaShare> listLiveShare(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("liveActivityId")Integer liveActivityId);
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdLiveDict;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+@Mapper
+public interface TdLiveDictMapper extends BaseMapper<TdLiveDict> {
+
+}

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

@@ -25,11 +25,13 @@ public interface IMiniAppService {
     WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String iv, String appid);
 
     void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt);
-    
+
     void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt);
-    
+
     void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt);
 
+    void sendCheckMessage(TaPerson toUser, String link, String name, String result, String programName, String failReason, String remark, LocalDateTime dt, Boolean isSuccess);
+
     ResponseBean getQrCode(String paramsStr, String appid);
 
     String createQrCode(WxMaService service, String path) throws Exception;

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

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+public interface ITaLiveActivityService extends IService<TaLiveActivity> {
+
+    /**
+     * 保存数据
+     *
+     * @param taLiveActivity
+     * @return
+     */
+    ResponseBean taLiveActivityAdd(TaLiveActivity taLiveActivity);
+
+    /**
+     * 条件查询直播活动列表
+     *
+     * @param liveDetailType
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param liveActivityTitle
+     * @param cityId
+     * @param buildingId
+     * @param status
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
+                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 访问量自增
+     *
+     * @param id
+     * @return
+     */
+    ResponseBean addVisitNum(String id);
+
+    /**
+     * 获取直播活动详情
+     *
+     * @param id
+     * @return
+     */
+    ResponseBean getLiveActivityDetailById(String id,Integer orgId);
+
+    ResponseBean delLiveActivityList(Integer orgId, List<TaLiveActivity> liveActivityList);
+}

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

@@ -1,9 +1,9 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaSalesBatch;
 
 import java.util.List;
@@ -17,7 +17,7 @@ import java.util.List;
  * @since 2020-02-10
  */
 public interface ITaSalesBatchService extends IService<TaSalesBatch> {
-    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId);
+    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId);
 
     ResponseBean delSalesBatchList(Integer orgId, List<TaSalesBatch> taSalesBatchList);
 

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

@@ -21,4 +21,6 @@ public interface ITaShareService extends IService<TaShare> {
     void makeSure(String openid, String typeOf, String id, Integer orgId);
 
     ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId);
+
+    ResponseBean listLiveShare(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer liveActivityId);
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdLiveDict;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+public interface ITdLiveDictService extends IService<TdLiveDict> {
+
+}

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

@@ -88,7 +88,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
         if (null == miniapp) {
             log.error("小程序 {} 不存在", toUser.getMiniappId());
-            return ;
+            return;
         }
 
         // 消息内容类型
@@ -132,7 +132,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
             }
         }
 
-        String[] smsParams = { name, miniapp.getName() + "小程序" };
+        String[] smsParams = {name, miniapp.getName() + "小程序"};
         if (null == tpl) {
             log.error("小程序 {} 不存在 或者 无通知消息模板 {}", toUser.getMiniappId(), contentType);
 
@@ -141,7 +141,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         } else {
 
             if (isSubscribe) {
-                String[] data = new String[] { name, phone, content, DateUtils.cutSecond(dt) };
+                String[] data = new String[]{name, phone, content, DateUtils.cutSecond(dt)};
                 ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
                 if (res.getCode() != ResponseBean.CODE_SUCCESS) {
                     // 使用短信发送
@@ -161,13 +161,13 @@ public class MiniAppServiceImpl implements IMiniAppService {
         // 更新消息发送时间
         iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
-    
+
     @Override
     public void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
         TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
         if (null == miniapp) {
             log.error("小程序 {} 不存在", toUser.getMiniappId());
-            return ;
+            return;
         }
 
         // 消息内容类型
@@ -181,7 +181,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;
 
-        String[] smsParams = { miniapp.getName() + "小程序-" + activityName };
+        String[] smsParams = {miniapp.getName() + "小程序-" + activityName};
 
         if (null == tpl) {
             log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
@@ -191,7 +191,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         } else {
 
             if (isSubscribe) {
-                String[] data = new String[] { activityName, result, DateUtils.cutSecond(dt)};
+                String[] data = new String[]{activityName, result, DateUtils.cutSecond(dt)};
                 ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
                 if (res.getCode() != ResponseBean.CODE_SUCCESS) {
                     // 使用短信发送
@@ -219,7 +219,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
         if (null == miniapp) {
             log.error("小程序 {} 不存在", toUser.getMiniappId());
-            return ;
+            return;
         }
 
         // 消息内容类型
@@ -233,7 +233,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;
 
-        String[] smsParams = { miniapp.getName() + "小程序-" + activityName };
+        String[] smsParams = {miniapp.getName() + "小程序-" + activityName};
 
         if (null == tpl) {
             log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
@@ -243,7 +243,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         } else {
 
             if (isSubscribe) {
-                String[] data = new String[] { activityName, result, DateUtils.cutSecond(dt) };
+                String[] data = new String[]{activityName, result, DateUtils.cutSecond(dt)};
                 ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
                 if (res.getCode() != ResponseBean.CODE_SUCCESS) {
                     // 使用短信发送
@@ -266,6 +266,50 @@ public class MiniAppServiceImpl implements IMiniAppService {
         iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
 
+    @Override
+    public void sendCheckMessage(TaPerson toUser, String link, String name, String result, String programName,
+                                 String failReason, String remark, LocalDateTime dt, Boolean isSuccess) {
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return;
+        }
+
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_HOUSE;
+        TaMiniappTemplate tpl = getTplByType(contentType, toUser.getMiniappId());
+        boolean isSubscribe = null != tpl && (null == tpl.getIsSubscribe() ? false : tpl.getIsSubscribe());
+        // 消息发送类型
+        String messageType = null == tpl ? CommConstant.MESSAGE_TYPE_OF_SMS :
+                isSubscribe ? CommConstant.MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE : CommConstant.MESSAGE_TYPE_OF_MINIAPP_TEMPLATE;
+
+        String[] smsParams = {miniapp.getName() + "小程序-" + programName + name};
+
+        if (null == tpl) {
+            if (isSuccess) {
+                log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
+                // 短信发送
+                sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
+            }
+        } else {
+            if (isSubscribe) {
+                String[] data = new String[]{name, result, programName, remark, failReason, DateUtils.cutSecond(dt)};
+                ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+                if (res.getCode() != ResponseBean.CODE_SUCCESS && isSuccess) {
+                    // 使用短信发送
+                    sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
+                    messageType = CommConstant.MESSAGE_TYPE_OF_SMS;
+                }
+            } else {
+                log.info("发送模板消息");
+            }
+        }
+        // TODO 写消息发送日志
+        // 更新消息发送时间
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
+    }
+
+
     @Override
     public ResponseBean getQrCode(String paramsStr, String appid) {
         if (null == paramsStr) return ResponseBean.error("请指定二维码生成参数", ResponseBean.ERROR_MISSING_PARAMS);
@@ -365,7 +409,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
 
         TaMiniappTemplate tpl = getTplByType(tplName, toUser.getMiniappId());
-        if (null == tpl) return ;
+        if (null == tpl) return;
 
         String formid = taMiniFormidsService.getFormidBy(toUser.getMiniOpenid(), true);
         if (StringUtils.isEmpty(formid)) {

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

@@ -81,6 +81,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaShareActivityMapper taShareActivityMapper;
 
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
     @Autowired
     private TaExtendContentMapper taExtendContentMapper;
 
@@ -148,7 +151,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 //        Page<TaBuilding> page = new Page<>();
 //        page.setSize(pageSize == null ? 10 : pageSize);
 //        page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId,taPersonBuildingList);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
 //        page.setRecords(building);
         return ResponseBean.success(building);
     }
@@ -222,6 +225,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (null == building) {
             return ResponseBean.error("项目不存在", ResponseBean.ERROR_UNAVAILABLE);
         }
+
+        if (1 != building.getStatus()) {
+            return ResponseBean.error("项目未发布", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         //查询当前图片
         building.setBuildingImg(getBuildingImg(id, CommConstant.BUILDING_IMG_BANNER));
 
@@ -293,6 +301,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
         building.setShareActivityList(shareActivityList);
 
+        // TODO 直播活动
+        QueryWrapper<TaLiveActivity> liveActivityQueryWrapper = new QueryWrapper<>();
+        liveActivityQueryWrapper.eq("building_id", id);
+        liveActivityQueryWrapper.eq("status", 1);
+        List<TaLiveActivity> liveActivityList = taLiveActivityMapper.selectList(liveActivityQueryWrapper);
+        building.setLiveActivityList(liveActivityList);
+
         // 查询 周边数据
         QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
         mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
@@ -427,6 +442,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taShareActivityQueryWrapper.eq("building_id", building.getBuildingId());
             taShareActivityMapper.update(taShareActivity, taShareActivityQueryWrapper);
 
+            //更新直播城市
+            TaLiveActivity taLiveActivity = new TaLiveActivity();
+            taLiveActivity.setCityId(building.getCityId());
+            taLiveActivity.setBuildingId(building.getBuildingId());
+            QueryWrapper<TaLiveActivity> taLiveActivityQueryWrapper = new QueryWrapper<>();
+            taLiveActivityQueryWrapper.eq("building_id", building.getBuildingId());
+            taLiveActivityMapper.update(taLiveActivity, taLiveActivityQueryWrapper);
+
             //更新首页轮播、开屏广告、宣传位
             TaExtendContent taExtendContent = new TaExtendContent();
             taExtendContent.setCityId(building.getCityId());
@@ -608,6 +631,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setStatus(-1);
         taBuildingMapper.update(building, buildingIdQueryWrapper);
 
+        TaLiveActivity taLiveActivity = new TaLiveActivity();
+        QueryWrapper<TaLiveActivity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_id", id);
+        taLiveActivity.setStatus(0);
+        taLiveActivity.setCityId(null);
+        taLiveActivity.setBuildingId(null);
+        taLiveActivityMapper.update(taLiveActivity, queryWrapper);
         return ResponseBean.success("");
     }
 

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

@@ -0,0 +1,189 @@
+package com.huiju.estateagents.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaLiveActivityMapper;
+import com.huiju.estateagents.mapper.TdLiveDictMapper;
+import com.huiju.estateagents.service.*;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+@Service
+public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper, TaLiveActivity> implements ITaLiveActivityService {
+
+    private Logger logger = LoggerFactory.getLogger(TaLiveActivityServiceImpl.class);
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
+    @Autowired
+    private ITaMiniappService taMiniappService;
+
+    @Autowired
+    private IMiniAppService miniAppService;
+
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
+    @Autowired
+    private TaPosterServiceImpl taPosterService;
+
+    @Autowired
+    private ShareContentServiceImpl shareContentService;
+
+    @Autowired
+    private TdPosterTemplateServiceImpl posterTemplateService;
+
+    @Autowired
+    private TdLiveDictMapper tdLiveDictMapper;
+
+
+    @Override
+    public ResponseBean taLiveActivityAdd(TaLiveActivity taLiveActivity) {
+        logger.info("TaLiveActivityServiceImpl.taLiveActivityAdd 接收参数：" + JSONObject.toJSONString(taLiveActivity));
+
+        ResponseBean responseBean = new ResponseBean();
+
+        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");
+            return responseBean;
+        }
+        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+        taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
+        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
+        ResponseBean taMiniappQrcode = miniAppService.getQrCode
+                (CommConstant.LIVE_ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
+                        .replace("#1", "live"), taMiniapp.getMiniappId());
+        taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
+        updateById(taLiveActivity);
+
+        // 设置默认海报数据
+        TaShareContent shareContent = new TaShareContent();
+        shareContent.setOrgId(taLiveActivity.getOrgId());
+        shareContent.setTargetId(taLiveActivity.getLiveActivityId().toString());
+        shareContent.setShareContentTitle("直播看房，在线答疑，快上车~");
+//        shareContent.setShareContentImg(taLiveActivity.getDetailImg());
+        shareContent.setShareContentType(CommConstant.LIVE);
+        shareContent.setStatus(CommConstant.STATUS_NORMAL);
+        shareContent.setCreateDate(LocalDateTime.now());
+        taShareContentService.save(shareContent);
+
+        responseBean.addSuccess(taLiveActivity);
+        return responseBean;
+    }
+
+    @Override
+    public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
+                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
+                    "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
+                liveActivityTitle, cityId, buildingId, status);
+
+        IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId);
+    }
+
+    @Override
+    public ResponseBean addVisitNum(String id) {
+        ResponseBean responseBean = new ResponseBean();
+        Boolean result = taLiveActivityMapper.addVisitNum(id);
+        if (result) {
+            responseBean.addSuccess("成功");
+            return responseBean;
+        }
+        responseBean.addError("fail");
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getLiveActivityDetailById(String id, Integer orgId) {
+        logger.info("getLiveActivityDetailById 接收参数：id：{},orgId:{}", id, orgId);
+
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaLiveActivity> liveActivityQueryWrapper = new QueryWrapper<>();
+        liveActivityQueryWrapper.eq("live_activity_id", id);
+        liveActivityQueryWrapper.eq("org_id", orgId);
+        TaLiveActivity result = taLiveActivityMapper.selectOne(liveActivityQueryWrapper);
+        if (result == null) {
+            responseBean.addSuccess(null);
+            return responseBean;
+        }
+
+        // 获取直播小程序信息
+        QueryWrapper<TdLiveDict> tdLiveDictQueryWrapper = new QueryWrapper<>();
+        tdLiveDictQueryWrapper.eq("id", result.getLiveApp());
+        tdLiveDictQueryWrapper.eq("status", "1");
+        TdLiveDict tdLiveDict = tdLiveDictMapper.selectOne(tdLiveDictQueryWrapper);
+        if (tdLiveDict == null) {
+            responseBean.addSuccess(null);
+            return responseBean;
+        }
+        result.setLiveAppName(tdLiveDict.getLivePlatName());
+        result.setLiveAppAppId(tdLiveDict.getLivePlatValue());
+
+        // 获取海报信息
+        QueryWrapper<TaPoster> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id", id + "");
+        queryWrapper.eq("target_type", CommConstant.LIVE);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaPoster> posterList = taPosterService.list(queryWrapper);
+
+        List<TaPoster> resultPosterList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(posterList)) {
+            for (TaPoster poster : posterList) {
+                QueryWrapper<TdPosterTemplate> templateQueryWrapper = new QueryWrapper<>();
+                templateQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+                templateQueryWrapper.eq("type ", "liveActivity");
+                List<TdPosterTemplate> posterTemplate = posterTemplateService.list(templateQueryWrapper);
+
+                poster.setTemplates(posterTemplate);
+                resultPosterList.add(poster);
+            }
+        }
+
+        // 获取分享内容信息
+        List<TaShareContent> shareContentList = shareContentService.getPostersForTarget(id + "", CommConstant.LIVE);
+
+        result.setPosters(resultPosterList);
+        result.setShareContents(shareContentList);
+        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/TaPreselectionRecordServiceImpl.java

@@ -8,11 +8,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
-import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaApartmentImg;
 import com.huiju.estateagents.entity.TaBuildingImg;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
-import com.huiju.estateagents.entity.TaSharePersonFrom;
 import com.huiju.estateagents.mapper.TaApartmentImgMapper;
 import com.huiju.estateagents.mapper.TaBuildingImgMapper;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
@@ -21,6 +20,7 @@ import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +30,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * <p>
@@ -56,6 +58,12 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     @Autowired
     TaApartmentImgMapper taApartmentImgMapper;
 
+    @Autowired
+    private MiniAppServiceImpl miniAppService;
+
+    @Autowired
+    private TaPersonServiceImpl taPersonService;
+
     @Override
     public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId) {
         logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，orgId：{}，personId：{}", pageNum, pageSize, orgId, personId);
@@ -64,28 +72,30 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId);
 
         List<TaPreselectionRecordPO> poList = iPage.getRecords();
-        if (CollectionUtils.isNotEmpty(poList)) {
-            List<TaPreselectionRecordPO> resultList = new ArrayList<>();
-            List<TaBuildingImg> taBuildingImgList;
-            List<TaApartmentImg> buildingImg;
-            QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
-            QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
-            for (TaPreselectionRecordPO po : poList) {
-                apartmentImgQueryWrapper = new QueryWrapper<>();
-                apartmentImgQueryWrapper.eq("apartment_id", po.getApartmentId());
-                buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
-                for (TaApartmentImg apartmentImg : buildingImg) {
-                    buildingImgQueryWrapper = new QueryWrapper<>();
-                    buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
-                    buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
-                    buildingImgQueryWrapper.orderByAsc("order_no");
-                    taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
-                    po.setBuildingImgList(taBuildingImgList);
-                }
-                resultList.add(po);
+        if (CollectionUtils.isEmpty(poList)) {
+            return iPage;
+        }
+
+        List<TaPreselectionRecordPO> resultList = new ArrayList<>();
+        List<TaBuildingImg> taBuildingImgList;
+        List<TaApartmentImg> buildingImg;
+        QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
+        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+        for (TaPreselectionRecordPO po : poList) {
+            apartmentImgQueryWrapper = new QueryWrapper<>();
+            apartmentImgQueryWrapper.eq("apartment_id", po.getApartmentId());
+            buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+            for (TaApartmentImg apartmentImg : buildingImg) {
+                buildingImgQueryWrapper = new QueryWrapper<>();
+                buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                buildingImgQueryWrapper.orderByAsc("order_no");
+                taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+                po.setBuildingImgList(taBuildingImgList);
             }
-            iPage.setRecords(resultList);
+            resultList.add(po);
         }
+        iPage.setRecords(resultList);
         return iPage;
     }
 
@@ -95,36 +105,50 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         logger.info("listPreselectionRecord 接收参数：taPreselectionRecord:{}", JSONObject.toJSONString(taPreselectionRecord));
 
         ResponseBean responseBean = new ResponseBean();
+        String tip;
+        String checkType = "预选";
+
+        String houseId = taPreselectionRecord.getHouseId();
+        String personId = taPreselectionRecord.getPersonId();
 
         // 校验用户是否已经预选房源
-        TaPreselectionRecord record = taPreselectionRecordMapper
-                .getRecordByPersonIdAndHouseId(taPreselectionRecord.getPersonId(), taPreselectionRecord.getHouseId());
+        TaPreselectionRecord record = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
         if (record != null) {
-            responseBean.addError("已预选过此房源，请到选房记录中查看。");
+            tip = "已预选过此房源。";
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(taPreselectionRecord.getHouseId(), "0");
         if (resourcesPO == null) {
-            responseBean.addError("fail");
+            tip = "当前房源已临时取消发布。";
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         // 校验当前批次状态是否为已发布
         if (resourcesPO.getSaleBatchStatus() != 1) {
-            responseBean.addError("当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            tip = "当前销售批次已临时取消发布。";
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         // 校验当前房源状态是否为已发布
         if (1 != resourcesPO.getStatus()) {
-            responseBean.addError("当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            tip = "当前房源已临时取消发布。";
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         // 校验预选操作时间是否在规定范围内
         if (!DateUtils.checkTimeRange(resourcesPO.getPreselectionStartTime(), resourcesPO.getPreselectionEndTime(), null)) {
-            responseBean.addError("当前时间不在预选时间范围内，请联系置业顾问了解详情。");
+            tip = "当前时间不在预选时间范围内。";
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
+            responseBean.addError(tip);
             return responseBean;
         }
 
@@ -137,10 +161,13 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         // 更新房源表热度
         Boolean result = taHousingResourcesMapper.updateForAddHeat(taPreselectionRecord.getHouseId());
         if (result) {
+            sendSubscribeMsg(houseId, personId, checkType, "成功", "无", true);
             responseBean.addSuccess(taPreselectionRecord);
             return responseBean;
         }
-        responseBean.addError("fail");
+        tip = "未知原因失败，请联系置业顾问。";
+        sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
+        responseBean.addError(tip);
         return responseBean;
     }
 
@@ -150,6 +177,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         logger.info("taPreselectionRecordCancel 接收参数：personId：{}，houseId：{}", personId, houseId);
 
         ResponseBean responseBean = new ResponseBean<>();
+
         // 校验是否已经取消
         TaPreselectionRecord preselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
         if (preselectionRecord == null) {
@@ -177,7 +205,12 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         updateById(record);
 
         // 更新房源表热度
-        responseBean.addSuccess(taHousingResourcesMapper.updateForSubtractHeat(houseId));
+        Boolean result = taHousingResourcesMapper.updateForSubtractHeat(houseId);
+        if (result) {
+            responseBean.addSuccess(result);
+            return responseBean;
+        }
+        responseBean.addError("未知原因失败，请联系置业顾问。");
         return responseBean;
     }
 
@@ -189,4 +222,43 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         page.setRecords(list);
         return ResponseBean.success(page);
     }
+
+    /**
+     * 发送订阅消息
+     *
+     * @param houseId    房源ID
+     * @param personId   用户ID
+     * @param checkType  审核类型
+     * @param result     审核结果
+     * @param failReason 失败原因
+     * @param isSuccess  是否成功 true是(只有成功才发送短信)
+     */
+    public void sendSubscribeMsg(String houseId, String personId, String checkType, String result, String failReason, Boolean isSuccess) {
+        logger.info("sendSubscribeMsg 接收参数：houseId:{},checkType:{},result:{}，failReason:{}",
+                houseId, checkType, result, failReason);
+
+        ExecutorService threadPool = Executors.newCachedThreadPool();
+        threadPool.execute(() -> {
+            logger.info("sendSubscribeMsg 开始");
+
+            // 获取房源详情
+            TaHousingResourcesPO po = taHousingResourcesMapper.getHousingDetailById(houseId, "1");
+            if (po == null) {
+                logger.info("sendSubscribeMsg 未找到房源信息。");
+                return;
+            }
+
+            // 获取用户信息
+            TaPerson toUser = taPersonService.getById(personId);
+            if (toUser == null) {
+                return;
+            }
+
+            String link = String.format(CommConstant.HOUSE_DETAIL_PATH, houseId);
+            String progranName = StringUtils.isBlank(po.getBuildingName()) ? "无" : po.getBuildingName();
+            String remark = progranName;
+            miniAppService.sendCheckMessage(toUser, link, checkType, result, progranName, failReason, remark, LocalDateTime.now(), isSuccess);
+            logger.info("sendSubscribeMsg 结束");
+        });
+    }
 }

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

@@ -6,16 +6,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPosterMapper;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.ITaBuildingRoomService;
+import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
 import com.huiju.estateagents.service.ITaSalesBatchService;
 import org.apache.commons.collections.CollectionUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,9 +62,12 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
     @Autowired
     private ITaBuildingRoomService taBuildingRoomService;
 
+    @Autowired
+    private ITaBuildingService taBuildingService;
+
     @Override
-    public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
-        return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
+    public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId,taPersonBuildingListByUserId);
     }
 
     @Override
@@ -158,6 +160,12 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
             return responseBean;
         }
 
+        // 获取楼盘名称
+        TaBuilding taBuilding = taBuildingService.getById(result.getBuildingId());
+        if(taBuilding != null){
+            result.setBuildingName(taBuilding.getBuildingName());
+        }
+
         // 获取海报信息
         QueryWrapper<TaPoster> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("target_id", salesBatchId + "");

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

@@ -51,6 +51,9 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     @Autowired
     private TaSalesBatchMapper taSalesBatchMapper;
 
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
     @Resource
     private ApplicationContext applicationContext;
 
@@ -143,6 +146,19 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         return ResponseBean.success(result);
     }
 
+    @Override
+    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+        list.forEach(e -> {
+            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+        });
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
+
     @Override
     public void makeSure(String openid, String typeOf, String id, Integer orgId) {
         // 查找分享记录
@@ -186,13 +202,13 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public ResponseBean selectHouseShareList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer saleBatchId) {
+    public ResponseBean listLiveShare(Integer pageNum, Integer pageSize, Integer orgId, String personType, String shareType, String phone, Integer liveActivityId) {
         Page page = new Page(pageNum,pageSize);
         // 分页查询
-        List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);
-        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+        List<TaShare> list = taShareMapper.listLiveShare(page, orgId, personType, shareType, phone, liveActivityId);
+        TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(liveActivityId);
         list.forEach(e -> {
-            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+            e.setLiveActivityTitle(taLiveActivity.getLiveActivityTitle());
         });
         page.setRecords(list);
         return ResponseBean.success(page);

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdLiveDict;
+import com.huiju.estateagents.mapper.TdLiveDictMapper;
+import com.huiju.estateagents.service.ITdLiveDictService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-20
+ */
+@Service
+public class TdLiveDictServiceImpl extends ServiceImpl<TdLiveDictMapper, TdLiveDict> implements ITdLiveDictService {
+
+}

src/main/resources/mapper/Activity.xml

@@ -23,6 +23,15 @@
         <if test="cityId != null and cityId != ''">
             and city_id = #{cityId}
         </if>
+        UNION ALL
+        SELECT
+        live_activity_id AS id,list_img AS main_img,live_activity_title,live_start_date,live_end_date, weight as heavy, 0 weight,status activity_status,          'live' AS type
+        FROM
+        ta_live_activity
+        WHERE org_id = #{orgId} and `status` = #{status}
+        <if test="cityId != null and cityId != ''">
+            and city_id = #{cityId}
+        </if>
         ORDER BY heavy desc,activity_status,start_date
     </select>
     <select id="getCustomerActivityList" resultType="java.util.Map">

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaLiveActivityMapper">
+
+    <update id="addVisitNum" parameterType="java.lang.String">
+        UPDATE ta_live_activity t
+        SET t.visit_num = IFNULL( t.visit_num, 0 ) + 1
+        WHERE
+            t.live_activity_id = #{id}
+    </update>
+
+    <update id ="updateLiveActivityStatus" >
+        UPDATE ta_live_activity t
+            SET t.`status` = -1,
+        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,c.user_name as createName,d.user_name as updateName, t.* From ta_live_activity t
+     left join ta_building a on t.building_id = a.building_id
+     LEFT JOIN td_city b on t.city_id = b.id
+     left join ta_user c on t.create_user = c.user_id
+     left join ta_user d on t.update_user = d.user_id
+     where t.org_id = #{orgId} and t.status != -1
+     <if test="status != null">
+         and t.status = #{status}
+     </if>
+     <if test="liveActivityTitle != null and liveActivityTitle != ''">
+         and t.live_Activity_Title like CONCAT('%', #{liveActivityTitle}, '%')
+     </if>
+     <if test="cityId != null and cityId != ''">
+         and t.city_id = #{cityId}
+     </if><if test="buildingId != null and buildingId != ''">
+         and t.building_id = #{buildingId}
+    </if>
+    <if test="personBuildingList != null and personBuildingList.size > 0">
+        AND t.building_id in
+        <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+            #{personBuilding.buildingId}
+        </foreach>
+    </if>
+        order by t.weight desc
+    </select>
+
+</mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -356,6 +356,29 @@
             ) t
             group by t.target_id
 
+			union all
+				select * from (
+					SELECT
+						t.be_share AS target_id,
+						g.list_img AS activity_img,
+						g.live_activity_title AS activity_name,
+						'1' AS price,
+						'2' AS building_name,
+						'3' AS address,
+						1 AS building_type_id,
+						LEFT ( t.tagert_type, 4 ) AS eventType,
+						t.create_date AS visit_time
+					FROM
+						ta_share t
+						LEFT JOIN ta_live_activity g ON t.be_share = g.live_activity_id
+					WHERE
+						t.tagert_type LIKE CONCAT( 'live', '%' )
+							AND t.person_id = #{personId}
+						ORDER BY
+							t.create_date DESC
+							LIMIT 9999
+					) t
+				group by t.target_id
         ) t
         order by t.visit_time desc
     </select>

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -18,11 +18,17 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="salesBatchName != null and salesBatchName != ''">
-            and t.sales_batch_name = #{salesBatchName}
+            and t.sales_batch_name like CONCAT('%',#{salesBatchName}, '%')
         </if>
         <if test="status != null">
             and t.status = #{status}
         </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
     </select>
 
     <select id="countPreSelectRecord" resultType="java.lang.Integer">

src/main/resources/mapper/TaShareMapper.xml

@@ -20,4 +20,34 @@
       </if>
         order by t.create_date desc
     </select>
+
+    <select id="listLiveShare" resultType="com.huiju.estateagents.entity.TaShare">
+        SELECT
+            a.avatarurl AS photoOravatar,
+            a.nickname AS nameOrnick,
+            a.NAME,
+            a.phone,
+            a.person_type,
+            t.tagert_type,
+            t.create_date
+        FROM
+          ta_share_count t
+          LEFT JOIN ta_person a ON t.person_id = a.person_id
+          LEFT JOIN ta_live_activity b ON t.be_share = b.live_activity_id
+        WHERE
+          a.org_id = #{orgId}
+        AND t.tagert_type IN ( 'livePost', 'liveApp' )
+        AND b.live_activity_id = #{liveActivityId}
+        <if test = "personType != null and personType != ''" >
+            AND a.person_Type = #{personType}
+        </if>
+        <if test = "shareType != null and shareType != ''" >
+            AND t.tagert_type = #{shareType}
+        </if>
+        <if test = "phone != null and phone != ''" >
+            AND a.phone = #{phone}
+        </if>
+        ORDER BY
+        t.create_date DESC
+    </select>
 </mapper>

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>

src/main/resources/mapper/TaUserMapper.xml

@@ -67,7 +67,7 @@
             ta_user t
             LEFT JOIN ta_person_building b ON t.user_id = b.user_id
         WHERE
-            t.org_id = #{taUser.orgId}
+            t.org_id = #{taUser.orgId} AND (t.is_admin != 1 or t.is_admin is null)
             <if test="taUser.userName != null and taUser.userName != ''">
                 and t.user_name like CONCAT('%', #{taUser.userName}, '%')
             </if>

src/main/resources/mapper/TdLiveDictMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TdLiveDictMapper">
+
+</mapper>