* 提交直播相关代码

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

@@ -12,16 +12,18 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
-    *   前端控制器
-    * </p>
+ * 前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2020-02-20
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaLiveActivityController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaLiveActivityController.class);
@@ -29,28 +31,33 @@ public class TaLiveActivityController extends BaseController {
     @Autowired
     public ITaLiveActivityService iTaLiveActivityService;
 
-
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
+     * @param liveActivityTitle 直播活动标题
+     * @param cityId            所属城市
+     * @param buildingId        所属楼盘
+     * @param liveDetailType    详情类型 0是模板，1是自定义
+     * @param status            状态
+     * @param request
      * @return
      */
-    @RequestMapping(value="/taLiveActivity",method= RequestMethod.GET)
-    public ResponseBean taLiveActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @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,
+                                           String liveDetailType, Integer status,
+                                           HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            //使用分页插件
-		    IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaLiveActivity> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaLiveActivity> result = iTaLiveActivityService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
+            Integer orgId = getOrgId(request);
+            responseBean = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
+                    liveActivityTitle, cityId, buildingId, liveDetailType, status);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taLiveActivityList -=- {}",e.toString());
+            logger.error("taLiveActivityList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +65,20 @@ public class TaLiveActivityController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taLiveActivity 实体对象
      * @return
      */
-    @RequestMapping(value="/taLiveActivity",method= RequestMethod.POST)
-    public ResponseBean taLiveActivityAdd(@RequestBody TaLiveActivity taLiveActivity){
+    @RequestMapping(value = "/admin/taLiveActivity", method = RequestMethod.POST)
+    public ResponseBean taLiveActivityAdd(@RequestBody TaLiveActivity taLiveActivity, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaLiveActivityService.save(taLiveActivity)){
-                responseBean.addSuccess(taLiveActivity);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
+            Integer orgId = getOrgId(request);
+            taLiveActivity.setOrgId(orgId);
+            responseBean = iTaLiveActivityService.taLiveActivityAdd(taLiveActivity);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taLiveActivityAdd -=- {}",e.toString());
+            logger.error("taLiveActivityAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +86,22 @@ public class TaLiveActivityController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taLiveActivity/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taLiveActivityDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taLiveActivity/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taLiveActivityDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaLiveActivityService.removeById(id)){
+            if (iTaLiveActivityService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taLiveActivityDelete -=- {}",e.toString());
+            logger.error("taLiveActivityDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,23 +109,24 @@ public class TaLiveActivityController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id             实体ID
      * @param taLiveActivity 实体对象
      * @return
      */
-    @RequestMapping(value="/taLiveActivity/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taLiveActivity/{id}", method = RequestMethod.PUT)
     public ResponseBean taLiveActivityUpdate(@PathVariable Integer id,
-                                             @RequestBody TaLiveActivity taLiveActivity){
+                                             @RequestBody TaLiveActivity taLiveActivity) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaLiveActivityService.updateById(taLiveActivity)){
+            if (iTaLiveActivityService.updateById(taLiveActivity)) {
                 responseBean.addSuccess(taLiveActivity);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taLiveActivityUpdate -=- {}",e.toString());
+            logger.error("taLiveActivityUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,16 +134,36 @@ public class TaLiveActivityController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taLiveActivity/{id}",method= RequestMethod.GET)
-    public ResponseBean taLiveActivityGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taLiveActivity/{id}", method = RequestMethod.GET)
+    public ResponseBean taLiveActivityGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaLiveActivityService.getById(id));
-        }catch (Exception e){
+        } 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("taLiveActivityDelete -=- {}",e.toString());
+            logger.error("addVisitNum -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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,23 +62,45 @@ 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/TdLiveDictController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-20
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TdLiveDictController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdLiveDictController.class);
@@ -36,7 +36,7 @@ public class TdLiveDictController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/tdLiveDict",method= RequestMethod.GET)
+    @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();
@@ -44,6 +44,7 @@ public class TdLiveDictController extends BaseController {
             //使用分页插件
 		    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);

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

@@ -125,5 +125,10 @@ public class TaLiveActivity implements Serializable {
      */
     private String updateUser;
 
+    /**
+     * 权重
+     */
+//    private Integer weight;
+
 
 }

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

@@ -96,4 +96,10 @@ public class TaShare implements Serializable {
      */
     @TableField(exist = false)
     private String salesBatchName;
+
+    /**
+     * 分享内容
+     */
+    @TableField(exist = false)
+    private String shareContent;
 }

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

@@ -3,16 +3,27 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaLiveActivity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
- *   Mapper 接口
+ * 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);
+
 }

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/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);
+
     ResponseBean getQrCode(String paramsStr, String appid);
 
     String createQrCode(WxMaService service, String path) throws Exception;

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

@@ -1,11 +1,12 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaLiveActivity;
 
 /**
  * <p>
- *   服务类
+ * 服务类
  * </p>
  *
  * @author jobob
@@ -13,4 +14,35 @@ import com.huiju.estateagents.entity.TaLiveActivity;
  */
 public interface ITaLiveActivityService extends IService<TaLiveActivity> {
 
+    /**
+     * 保存数据
+     *
+     * @param taLiveActivity
+     * @return
+     */
+    ResponseBean taLiveActivityAdd(TaLiveActivity taLiveActivity);
+
+    /**
+     * 条件查询直播活动列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param liveActivityTitle
+     * @param cityId
+     * @param buildingId
+     * @param liveDetailType
+     * @param status
+     * @return
+     */
+    ResponseBean listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
+                                             String cityId, String buildingId, String liveDetailType, Integer status);
+
+    /**
+     * 访问量自增
+     *
+     * @param id
+     * @return
+     */
+    ResponseBean addVisitNum(String id);
 }

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/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,33 @@ 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) {
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return;
+        }
+
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_CHECK;
+        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;
+        if (isSubscribe) {
+            String[] data = new String[]{name, result, programName, failReason, DateUtils.cutSecond(dt)};
+            sendSubscribeMessage(tpl, toUser, link, data);
+        }
+
+        // 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 +392,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/TaLiveActivityServiceImpl.java

@@ -1,14 +1,31 @@
 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.TaLiveActivity;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaShareContent;
 import com.huiju.estateagents.mapper.TaLiveActivityMapper;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaLiveActivityService;
+import com.huiju.estateagents.service.ITaMiniappService;
+import com.huiju.estateagents.service.TaShareContentService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
- *   服务实现类
+ * 服务实现类
  * </p>
  *
  * @author jobob
@@ -17,4 +34,94 @@ import org.springframework.stereotype.Service;
 @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;
+
+
+    @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());
+        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);
+        /**
+         *  TODO 部分信息待修改
+         */
+        ResponseBean taMiniappQrcode = miniAppService.getQrCode
+                (CommConstant.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("live");
+        shareContent.setStatus(1);
+        shareContent.setCreateDate(LocalDateTime.now());
+        taShareContentService.save(shareContent);
+
+        responseBean.addSuccess(taLiveActivity);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
+                                                    String cityId, String buildingId, String liveDetailType, Integer status) {
+        logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
+                    "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
+                liveActivityTitle, cityId, buildingId, liveDetailType, status);
+
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaLiveActivity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like("live_activity_title", liveActivityTitle);
+        queryWrapper.eq("city_id", cityId);
+        queryWrapper.eq("building_id", buildingId);
+        queryWrapper.eq("live_detail_type", liveDetailType);
+        queryWrapper.eq("status", status);
+        queryWrapper.orderByDesc("create_date");
+        IPage<TaLiveActivity> result = page(pg, queryWrapper);
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
+
+    @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;
+    }
 }

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;
@@ -30,6 +29,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 +57,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 +71,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 +104,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);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(taPreselectionRecord.getHouseId(), "0");
         if (resourcesPO == null) {
-            responseBean.addError("fail");
+            tip = "未知原因失败，请联系置业顾问。";
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         // 校验当前批次状态是否为已发布
         if (resourcesPO.getSaleBatchStatus() != 1) {
-            responseBean.addError("当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            tip = "当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。";
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         // 校验当前房源状态是否为已发布
         if (1 != resourcesPO.getStatus()) {
-            responseBean.addError("当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            tip = "当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。";
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         // 校验预选操作时间是否在规定范围内
         if (!DateUtils.checkTimeRange(resourcesPO.getPreselectionStartTime(), resourcesPO.getPreselectionEndTime(), null)) {
-            responseBean.addError("当前时间不在预选时间范围内，请联系置业顾问了解详情。");
+            tip = "当前时间不在预选时间范围内，请联系置业顾问了解详情。";
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+            responseBean.addError(tip);
             return responseBean;
         }
 
@@ -137,10 +160,13 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         // 更新房源表热度
         Boolean result = taHousingResourcesMapper.updateForAddHeat(taPreselectionRecord.getHouseId());
         if (result) {
+            sendSubscribeMsg(houseId, personId, checkType, "成功", "");
             responseBean.addSuccess(taPreselectionRecord);
             return responseBean;
         }
-        responseBean.addError("fail");
+        tip = "未知原因失败，请联系置业顾问。";
+        sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+        responseBean.addError(tip);
         return responseBean;
     }
 
@@ -150,22 +176,31 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         logger.info("taPreselectionRecordCancel 接收参数：personId：{}，houseId：{}", personId, houseId);
 
         ResponseBean responseBean = new ResponseBean<>();
+        String tip;
+        String checkType = "取消预选";
+
         // 校验是否已经取消
         TaPreselectionRecord preselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
         if (preselectionRecord == null) {
-            responseBean.addError("未预选过此房源，或已取消预选此房源");
+            tip = "未预选过此房源，或已取消预选此房源";
+            sendSubscribeMsg(houseId,personId,checkType,"失败",tip);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(houseId, "0");
         if (resourcesPO == null || 1 != resourcesPO.getStatus()) {
-            responseBean.addError("当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            tip = "当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。";
+            sendSubscribeMsg(houseId,personId,checkType,"失败",tip);
+            responseBean.addError(tip);
             return responseBean;
         }
 
         // 校验当前批次状态是否为已发布
         if (resourcesPO.getSaleBatchStatus() != 1) {
-            responseBean.addError("当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            tip = "当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。";
+            sendSubscribeMsg(houseId,personId,checkType,"失败",tip);
+            responseBean.addError(tip);
             return responseBean;
         }
 
@@ -177,7 +212,14 @@ 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;
+        }
+        tip = "未知原因失败，请联系置业顾问。";
+        sendSubscribeMsg(houseId,personId,checkType,"失败",tip);
+        responseBean.addError(tip);
         return responseBean;
     }
 
@@ -189,4 +231,42 @@ 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 失败原因
+     */
+    public void sendSubscribeMsg(String houseId, String personId, String checkType, String result, String failReason) {
+        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 remark = "";
+            String progranName = po.getBuildingName() + po.getTermName() + po.getBlockName() + po.getUnitName() + po.getFloorName() + po.getRoomName();
+            miniAppService.sendCheckMessage(toUser, link, checkType, result, progranName, failReason, remark, LocalDateTime.now());
+            logger.info("sendSubscribeMsg 结束");
+        });
+    }
 }

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

@@ -12,6 +12,7 @@ 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;
@@ -63,6 +64,9 @@ 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);
@@ -158,6 +162,12 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
             return responseBean;
         }
 
+        // 获取楼盘名称
+        TaBuilding taBuilding = taBuildingService.getById(result.getBuildingId());
+        if(taBuilding != null){
+            taBuilding.setBuildingName(taBuilding.getName());
+        }
+
         // 获取海报信息
         QueryWrapper<TaPoster> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("target_id", salesBatchId + "");

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

@@ -198,6 +198,14 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         return ResponseBean.success(page);
     }
 
+    @Override
+    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.listLiveShare(page, orgId, personType, shareType, phone, liveActivityId);
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
+
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }

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,0 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,12 @@
+<?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>
+
+</mapper>

src/main/resources/mapper/TaShareMapper.xml

@@ -8,7 +8,7 @@
       left join ta_sales_batch b on t.be_share = b.sales_batch_id
       where a.org_id = #{orgId}
       and t.tagert_type in ('housePost','houseApp')
-      and b.sales_batch_id = #{saleBatchId}
+      and b.sales_batch_id = #{liveActivityId}
       <if test="personType != null and personType != ''">
           and a.person_Type = #{personType}
       </if>
@@ -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>