* 代码优化

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

@@ -465,7 +465,7 @@ public class CommConstant {
      * 审核通知  预选/认筹
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MESSAGE_CONTENT_OF_CHECK = "check-result";
+    public static final String MESSAGE_CONTENT_OF_HOUSE = "house";
     
     /**
      * 活动以结束

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

@@ -394,7 +394,7 @@ public class TaPersonVisitRecordController extends BaseController {
                     e.setHouseShareNum(shareNum);
                     break;
                 case CommConstant.LIVE:
-                    e.setLiveSareNum(shareNum);
+                    e.setLiveShareNum(shareNum);
                     break;
             }
         });

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

@@ -38,5 +38,5 @@ public class TaConsultantInfo {
 
     private String priceType;
 
-    private Integer liveSareNum;
+    private Integer liveShareNum;
 }

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

@@ -146,4 +146,15 @@ public class TaLiveActivity implements Serializable {
 
     @TableField(exist = false)
     private String cityName;
+
+    @TableField(exist = false)
+    private String liveAppName;
+
+    @TableField(exist = false)
+    private String liveAppAppId;
+
+    @TableField(exist = false)
+    private String liveAppPath;
+
+
 }

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

@@ -30,7 +30,7 @@ public interface IMiniAppService {
 
     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);
+    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);
 

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

@@ -268,7 +268,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
     @Override
     public void sendCheckMessage(TaPerson toUser, String link, String name, String result, String programName,
-                                 String failReason, String remark, LocalDateTime dt) {
+                                 String failReason, String remark, LocalDateTime dt, Boolean isSuccess) {
         TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
         if (null == miniapp) {
             log.error("小程序 {} 不存在", toUser.getMiniappId());
@@ -276,32 +276,32 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
 
         // 消息内容类型
-        String contentType = CommConstant.MESSAGE_CONTENT_OF_CHECK;
+        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() + "小程序-" + name};
+        String[] smsParams = {miniapp.getName() + "小程序-" + programName + name};
 
         if (null == tpl) {
-            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
-
-            // 短信发送
-            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
+            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) {
+                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 写消息发送日志

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

@@ -9,6 +9,7 @@ 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;
@@ -56,6 +57,9 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
     @Autowired
     private TdPosterTemplateServiceImpl posterTemplateService;
 
+    @Autowired
+    private TdLiveDictMapper tdLiveDictMapper;
+
 
     @Override
     public ResponseBean taLiveActivityAdd(TaLiveActivity taLiveActivity) {
@@ -102,7 +106,7 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
 
     @Override
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                    String cityId, String buildingId, Integer status) {
+                                                             String cityId, String buildingId, Integer status) {
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
                     "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
                 liveActivityTitle, cityId, buildingId, status);
@@ -124,19 +128,31 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
     }
 
     @Override
-    public ResponseBean getLiveActivityDetailById(String id,Integer orgId) {
-        logger.info("getLiveActivityDetailById 接收参数：id：{},orgId:{}", id,orgId);
+    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);
+        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 + "");
@@ -169,7 +185,7 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
     @Override
     public ResponseBean delLiveActivityList(Integer orgId, List<TaLiveActivity> liveActivityList) {
         ResponseBean responseBean = new ResponseBean();
-        taLiveActivityMapper.updateLiveActivityStatus(orgId,liveActivityList);
+        taLiveActivityMapper.updateLiveActivityStatus(orgId, liveActivityList);
         return responseBean;
     }
 }

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

@@ -114,7 +114,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         TaPreselectionRecord record = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
         if (record != null) {
             tip = "已预选过此房源，请到选房记录中查看。";
-            sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
             responseBean.addError(tip);
             return responseBean;
         }
@@ -122,7 +122,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(taPreselectionRecord.getHouseId(), "0");
         if (resourcesPO == null) {
             tip = "未知原因失败，请联系置业顾问。";
-            sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
             responseBean.addError(tip);
             return responseBean;
         }
@@ -130,7 +130,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         // 校验当前批次状态是否为已发布
         if (resourcesPO.getSaleBatchStatus() != 1) {
             tip = "当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。";
-            sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
             responseBean.addError(tip);
             return responseBean;
         }
@@ -138,7 +138,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         // 校验当前房源状态是否为已发布
         if (1 != resourcesPO.getStatus()) {
             tip = "当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。";
-            sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
             responseBean.addError(tip);
             return responseBean;
         }
@@ -146,7 +146,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         // 校验预选操作时间是否在规定范围内
         if (!DateUtils.checkTimeRange(resourcesPO.getPreselectionStartTime(), resourcesPO.getPreselectionEndTime(), null)) {
             tip = "当前时间不在预选时间范围内，请联系置业顾问了解详情。";
-            sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
             responseBean.addError(tip);
             return responseBean;
         }
@@ -160,12 +160,12 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         // 更新房源表热度
         Boolean result = taHousingResourcesMapper.updateForAddHeat(taPreselectionRecord.getHouseId());
         if (result) {
-            sendSubscribeMsg(houseId, personId, checkType, "成功", "");
+            sendSubscribeMsg(houseId, personId, checkType, "成功", "无", true);
             responseBean.addSuccess(taPreselectionRecord);
             return responseBean;
         }
         tip = "未知原因失败，请联系置业顾问。";
-        sendSubscribeMsg(houseId, personId, checkType, "失败", tip);
+        sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
         responseBean.addError(tip);
         return responseBean;
     }
@@ -183,7 +183,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         TaPreselectionRecord preselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
         if (preselectionRecord == null) {
             tip = "未预选过此房源，或已取消预选此房源";
-            sendSubscribeMsg(houseId,personId,checkType,"失败",tip);
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
             responseBean.addError(tip);
             return responseBean;
         }
@@ -191,7 +191,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(houseId, "0");
         if (resourcesPO == null || 1 != resourcesPO.getStatus()) {
             tip = "当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。";
-            sendSubscribeMsg(houseId,personId,checkType,"失败",tip);
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
             responseBean.addError(tip);
             return responseBean;
         }
@@ -199,7 +199,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         // 校验当前批次状态是否为已发布
         if (resourcesPO.getSaleBatchStatus() != 1) {
             tip = "当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。";
-            sendSubscribeMsg(houseId,personId,checkType,"失败",tip);
+            sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
             responseBean.addError(tip);
             return responseBean;
         }
@@ -215,10 +215,11 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         Boolean result = taHousingResourcesMapper.updateForSubtractHeat(houseId);
         if (result) {
             responseBean.addSuccess(result);
+            sendSubscribeMsg(houseId, personId, checkType, "成功", "无", true);
             return responseBean;
         }
         tip = "未知原因失败，请联系置业顾问。";
-        sendSubscribeMsg(houseId,personId,checkType,"失败",tip);
+        sendSubscribeMsg(houseId, personId, checkType, "失败", tip, false);
         responseBean.addError(tip);
         return responseBean;
     }
@@ -240,8 +241,9 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
      * @param checkType  审核类型
      * @param result     审核结果
      * @param failReason 失败原因
+     * @param isSuccess  是否成功 true是(只有成功才发送短信)
      */
-    public void sendSubscribeMsg(String houseId, String personId, String checkType, String result, String failReason) {
+    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);
 
@@ -263,9 +265,9 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
             }
 
             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());
+            String progranName = (po.getBuildingName() + po.getTermName() + po.getBlockName() + po.getUnitName() + po.getFloorName() + po.getRoomName()).replace("null", "");
+            String remark = progranName;
+            miniAppService.sendCheckMessage(toUser, link, checkType, result, progranName, failReason, remark, LocalDateTime.now(), isSuccess);
             logger.info("sendSubscribeMsg 结束");
         });
     }

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -366,7 +366,7 @@
 						'2' AS building_name,
 						'3' AS address,
 						1 AS building_type_id,
-						LEFT ( t.tagert_type, 5 ) AS eventType,
+						LEFT ( t.tagert_type, 4 ) AS eventType,
 						t.create_date AS visit_time
 					FROM
 						ta_share t