* 优化代码

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

@@ -171,10 +171,10 @@ public class TaLiveActivityController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taLiveActivity/{id}", method = RequestMethod.GET)
-    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id) {
+    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaLiveActivityService.getLiveActivityDetailById(id);
+            responseBean = iTaLiveActivityService.getLiveActivityDetailById(id, getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("getLiveActivityDetailById -=- {}", e.toString());

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/service/ITaLiveActivityService.java

@@ -55,7 +55,7 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @param id
      * @return
      */
-    ResponseBean getLiveActivityDetailById(String id);
+    ResponseBean getLiveActivityDetailById(String id,Integer orgId);
 
     ResponseBean delLiveActivityList(Integer orgId, List<TaLiveActivity> liveActivityList);
 }

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

@@ -282,11 +282,28 @@ public class MiniAppServiceImpl implements IMiniAppService {
         // 消息发送类型
         String messageType = null == tpl ? CommConstant.MESSAGE_TYPE_OF_SMS :
                 isSubscribe ? CommConstant.MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE : CommConstant.MESSAGE_TYPE_OF_MINIAPP_TEMPLATE;
-        if (isSubscribe) {
-            String[] data = new String[]{name, result, programName, remark, failReason, DateUtils.cutSecond(dt)};
-            sendSubscribeMessage(tpl, toUser, link, data);
-        }
 
+        String[] smsParams = {miniapp.getName() + "小程序-" + name};
+
+        if (null == tpl) {
+            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) {
+                    // 使用短信发送
+                    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());

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

@@ -108,6 +108,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaSalesBatchService iTaSalesBatchService;
 
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -293,6 +296,14 @@ 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());

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

@@ -90,7 +90,7 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         shareContent.setOrgId(taLiveActivity.getOrgId());
         shareContent.setTargetId(taLiveActivity.getLiveActivityId().toString());
         shareContent.setShareContentTitle("直播看房，在线答疑，快上车~");
-        shareContent.setShareContentImg(taLiveActivity.getDetailImg());
+//        shareContent.setShareContentImg(taLiveActivity.getDetailImg());
         shareContent.setShareContentType(CommConstant.LIVE);
         shareContent.setStatus(CommConstant.STATUS_NORMAL);
         shareContent.setCreateDate(LocalDateTime.now());
@@ -124,11 +124,14 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
     }
 
     @Override
-    public ResponseBean getLiveActivityDetailById(String id) {
-        logger.info("getLiveActivityDetailById 接收参数：id：{}", id);
+    public ResponseBean getLiveActivityDetailById(String id,Integer orgId) {
+        logger.info("getLiveActivityDetailById 接收参数：id：{},orgId:{}", id,orgId);
 
         ResponseBean responseBean = new ResponseBean();
-        TaLiveActivity result = getById(id);
+        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;