feats: add message send logic

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

@@ -445,19 +445,19 @@ public class CommConstant {
      * 消息通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_NOTICE = "notice";
+    public static final String MESSAGE_CONTENT_OF_NOTICE = "notice";
     
     /**
      * 助力通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_HELP = "help-result";
+    public static final String MESSAGE_CONTENT_OF_HELP = "help-result";
     
     /**
      * 拼团通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_GROUP = "group-result";
+    public static final String MESSAGE_CONTENT_OF_GROUP = "group-result";
     
     /**
      * 活动以结束
@@ -515,4 +515,30 @@ public class CommConstant {
      * 埋点类型h5
      */
     public static final String EVENT_H5 = "h5";
+
+    /**
+     * 系统参数  通知消息次时间间隔
+     */
+    public static final String SYSPARAM_NOTICE_MESSAGE_INTERVAL = "notice_message_interval";
+
+    /**
+     * 任一消息, 可以是下面的任意一种
+     */
+    public static final String MESSAGE_TYPE_OF_SOMEWAY = "someway";
+
+    /**
+     * 短信消息
+     */
+    public static final String MESSAGE_TYPE_OF_SMS = "sms";
+
+    /**
+     * 小程序订阅消息
+     */
+    public static final String MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE = "miniapp_subscribe";
+
+    /**
+     * 小程序模板消息
+     */
+    public static final String MESSAGE_TYPE_OF_MINIAPP_TEMPLATE = "miniapp_template";
+
 }

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

@@ -0,0 +1,4 @@
+package com.huiju.estateagents.common;
+
+public class NumberUtils {
+}

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

@@ -0,0 +1,78 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户消息规则
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPersonMessageRule implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 人员ID
+     */
+    private String personId;
+
+    /**
+     * 消息类型
+     */
+    private String messageType;
+
+    /**
+     * 内容类型
+     */
+    private String contentType;
+
+    /**
+     * 限制条数
+     */
+    private Integer limitNum;
+
+    /**
+     * 当前使用
+     */
+    private Integer leftNum;
+
+    /**
+     * 上次发送时间
+     */
+    private LocalDateTime lastSendTime;
+
+    /**
+     * 上次消息ID
+     */
+    private String lastMessageId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+}

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

@@ -0,0 +1,28 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonMessageRule;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Mapper
+public interface TaPersonMessageRuleMapper extends BaseMapper<TaPersonMessageRule> {
+
+    /**
+     * 依据人员ID, 消息类型, 内容类型, 等获取人员消息规则
+     * @param personId
+     * @param messageType
+     * @param contentType
+     * @param orgId
+     * @return
+     */
+    TaPersonMessageRule getByPersonAndType(@Param("personId") String personId, @Param("messageType") String messageType, @Param("contentType") String contentType, @Param("orgId") Integer orgId);
+}

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

@@ -30,10 +30,6 @@ public interface IMiniAppService {
     
     void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt);
 
-    void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content);
-
-    void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName);
-
     ResponseBean getQrCode(String paramsStr, String appid);
 
     String createQrCode(WxMaService service, String path) throws Exception;

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

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonMessageRule;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 人员消息规则 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+public interface ITaPersonMessageRuleService extends IService<TaPersonMessageRule> {
+    /**
+     * 依据 人员ID, 消息类型等查询人员消息规则
+     * @param personId
+     * @param messageType
+     * @param contentType
+     * @param orgId
+     * @return
+     */
+    TaPersonMessageRule getByPersonAndType(String personId, String messageType, String contentType, Integer orgId);
+
+    /**
+     * 依据 人员ID, 消息类型等更新或者插入人员消息规则
+     * @param personId
+     * @param messageType
+     * @param contentType
+     * @param orgId
+     * @return
+     */
+    TaPersonMessageRule saveOrUpdateByPersonAndMessage(String personId, String messageType, String contentType, Integer orgId);
+}

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

@@ -9,13 +9,16 @@ import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.service.ISysOrgParamsService;
 import com.huiju.estateagents.service.ITaMiniFormidsService;
+import com.huiju.estateagents.service.ITaPersonMessageRuleService;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,6 +45,12 @@ public class MiniAppServiceImpl implements IMiniAppService {
     @Autowired
     SysSmsSettingMapper sysSmsSettingMapper;
 
+    @Autowired
+    ITaPersonMessageRuleService iTaPersonMessageRuleService;
+
+    @Autowired
+    ISysOrgParamsService iSysOrgParamsService;
+
     @Autowired
     WxUtils wxUtils;
 
@@ -81,33 +90,76 @@ public class MiniAppServiceImpl implements IMiniAppService {
             log.error("小程序 {} 不存在", toUser.getMiniappId());
             return ;
         }
-        String[] smsParams = { name, miniapp.getName() + "小程序" };
 
-        TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_NOTICE, toUser.getMiniappId());
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_NOTICE;
+
+        // 查询消息类型, 优先选择订阅消息发送
+        TaMiniappTemplate tpl = getTplByType(contentType, toUser.getMiniappId());
+
+        boolean isSubscribe = null != tpl && (null == tpl.getIsSubscribe() ? false : tpl.getIsSubscribe());
+
+        // 入库的消息类型使用的是 MESSAGE_TYPE_OF_SOMEWAY, 不能使用真正的类型
+        // 因为 通知消息 只注重内容, 不在乎 发送方式
+        String messageType = CommConstant.MESSAGE_TYPE_OF_SOMEWAY;
+
+        // 消息发送间隔, -1 代表不限制
+        float interval = -1f;
+
+        // 获取系统设置, 单位分钟
+        SysOrgParams sysOrgParams = iSysOrgParamsService.getParamByCode(CommConstant.SYSPARAM_NOTICE_MESSAGE_INTERVAL, toUser.getOrgId());
+        if (null != sysOrgParams && !StringUtils.isEmpty(sysOrgParams.getParamValue())) {
+            interval = Float.parseFloat(sysOrgParams.getParamValue());
+        }
+
+        // 获取用户消息发送记录
+        TaPersonMessageRule taPersonMessageRule = iTaPersonMessageRuleService.getByPersonAndType(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
+        if (null == taPersonMessageRule) {
+            interval = -1f;
+        }
+
+        // 如果需要判断间隔
+        if (interval > 0 && null != taPersonMessageRule.getLastSendTime()) {
+            LocalDateTime now = LocalDateTime.now();
+            // 间隔时间
+            Duration diff = Duration.between(taPersonMessageRule.getLastSendTime(), now);
+
+            // 统一转换为 秒 比较
+            // 如果间隔时间小于设定时间, 就不发送消息
+            if ((diff.toMillis() / 1000) < (interval * 60)) {
+                log.info("通知消息间隔小于设定值, 不变发送消息");
+                return;
+            }
+        }
+
+        String[] smsParams = { name, miniapp.getName() + "小程序" };
         if (null == tpl) {
-            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_NOTICE);
+            log.error("小程序 {} 不存在 或者 无通知消息模板 {}", toUser.getMiniappId(), contentType);
 
             // 短信发送
-            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_NOTICE, smsParams);
-        };
-
-        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
-            String[] data = new String[] { name, phone, content, DateUtils.cutSecond(dt) };
-            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
-            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
-                // 使用短信发送
-                sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_NOTICE, smsParams);
-            }
+            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
         } else {
-            List<WxMaTemplateData> data = new ArrayList<>();
-            data.add(new WxMaTemplateData("keyword1", name, "#fffff"));
-            data.add(new WxMaTemplateData("keyword2", phone, "#fffff"));
-            data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
-            data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
 
-            sendMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
-            return;
+            if (isSubscribe) {
+                String[] data = new String[] { name, phone, content, 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);
+                }
+            } else {
+                List<WxMaTemplateData> data = new ArrayList<>();
+                data.add(new WxMaTemplateData("keyword1", name, "#fffff"));
+                data.add(new WxMaTemplateData("keyword2", phone, "#fffff"));
+                data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
+                data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
+
+                sendMessage(contentType, toUser, link, data);
+            }
         }
+
+        // 更新消息发送时间
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
     
     @Override
@@ -117,31 +169,49 @@ public class MiniAppServiceImpl implements IMiniAppService {
             log.error("小程序 {} 不存在", toUser.getMiniappId());
             return ;
         }
+
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_HELP;
+
+        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() + "小程序-" + activityName };
 
-        TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_HELP, toUser.getMiniappId());
         if (null == tpl) {
-            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_HELP);
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
 
             // 短信发送
-            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_HELP, smsParams);
-        };
-
-        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
-            String[] data = new String[] { activityName, result };
-            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
-            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
-                // 使用短信发送
-                sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_HELP, smsParams);
-            }
+            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
         } else {
-            List<WxMaTemplateData> data = new ArrayList<>();
-            data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
-            data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
-            data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
-            sendMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
-            return;
+
+            if (isSubscribe) {
+                String[] data = new String[] { activityName, result };
+                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 {
+                List<WxMaTemplateData> data = new ArrayList<>();
+                data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+                data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+                data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+                sendMessage(contentType, toUser, link, data);
+            }
         }
+
+        // TODO 写消息发送日志
+
+        // 更新消息发送时间
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
 
     @Override
@@ -151,91 +221,49 @@ public class MiniAppServiceImpl implements IMiniAppService {
             log.error("小程序 {} 不存在", toUser.getMiniappId());
             return ;
         }
-        String[] smsParams = { miniapp.getName() + "小程序-" + activityName };
 
-        TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_GROUP, toUser.getMiniappId());
-        if (null == tpl) {
-            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_GROUP);
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_GROUP;
 
-            // 短信发送
-            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_GROUP, smsParams);
-        };
-
-        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
-            String[] data = new String[] { activityName, result };
-            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
-            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
-                // 使用短信发送
-                sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_GROUP, smsParams);
-            }
-        } else {
-            List<WxMaTemplateData> data = new ArrayList<>();
-            data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
-            data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
-            data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
-            sendMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
-            return;
-        }
-    }
+        TaMiniappTemplate tpl = getTplByType(contentType, toUser.getMiniappId());
 
-    @Override
-    public void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {
-        TaMiniappTemplate tpl = getTplByType("mainbiz", toUser.getMiniappId());
-        if (null == tpl) {
-            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), "mainbiz");
+        boolean isSubscribe = null != tpl && (null == tpl.getIsSubscribe() ? false : tpl.getIsSubscribe());
 
-            // TODO
-            // 短信发送
-        };
-
-        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
-            String[] data = new String[] { custName, phone, sex, fromName, bizType, content };
-            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
-            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
-                // TODO
-                // 使用短信发送
-            }
-        } else {
-            List<WxMaTemplateData> data = new ArrayList<>();
-            data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
-            data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
-            data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
-            data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
-            data.add(new WxMaTemplateData("keyword5", bizType, "#fffff"));
-            data.add(new WxMaTemplateData("keyword6", content, "#fffff"));
-
-            sendMessage("mainbiz", toUser, link, data);
-            return;
-        }
-    }
+        // 消息发送类型
+        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 };
 
-    @Override
-    public void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName) {
-        TaMiniappTemplate tpl = getTplByType("newCustomer", toUser.getMiniappId());
         if (null == tpl) {
-            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), "newCustomer");
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
 
-            // TODO
             // 短信发送
-        };
-
-        if (((Boolean) true).equals(tpl.getIsSubscribe())) {
-            String[] data = new String[] { custName, phone, sex, fromName };
-            ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
-            if (res.getCode() != ResponseBean.CODE_SUCCESS) {
-                // TODO
-                // 使用短信发送
-            }
+            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
         } else {
-            List<WxMaTemplateData> data = new ArrayList<>();
-            data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
-            data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
-            data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
-            data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
 
-            sendMessage("newCustomer", toUser, link, data);
-            return;
+            if (isSubscribe) {
+                String[] data = new String[] { activityName, result };
+                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 {
+                List<WxMaTemplateData> data = new ArrayList<>();
+                data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+                data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+                data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+                sendMessage(contentType, toUser, link, data);
+            }
         }
+
+        // TODO 写消息发送日志
+
+        // 更新消息发送时间
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
 
     @Override
@@ -358,6 +386,8 @@ public class MiniAppServiceImpl implements IMiniAppService {
         } catch (WxErrorException e) {
             e.printStackTrace();
         }
+
+        // TODO 写消息发送日志
     }
 
     private ResponseBean sendSubscribeMessage(TaMiniappTemplate tpl, TaPerson toUser, String link, String[] data) {
@@ -388,9 +418,14 @@ public class MiniAppServiceImpl implements IMiniAppService {
             WxMaService wxService = wxUtils.getMiniApp(appid);
             wxService.getMsgService().sendSubscribeMsg(message);
 
+            // TODO 写消息发送日志
+
             return ResponseBean.success("消息发送成功");
         } catch (WxErrorException e) {
             e.printStackTrace();
+
+            // TODO 写消息发送日志
+
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -407,10 +442,16 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
         SysSmsSetting smsSetting = sysSmsSettingMapper.selectOne(query);
         if (null == smsSetting) {
+
+            // TODO 写消息发送日志
+
             return "没有设置有效的【" + type + "】短信模板";
         }
 
         boolean success = smsUtils.sendMessage(smsSetting.getTplCode(), tel, params);
+
+        // TODO 写消息发送日志
+
         return success ? null : "短信发送失败";
     }
 
@@ -420,7 +461,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
         String[] fileds = fieldsStr.split("\\|");
 
-        int length = fileds.length > list.length ? list.length : fileds.length;
+        int length = Math.min(fileds.length, list.length);
         for (int i = 0; i < length; i++) {
             data.add(new WxMaSubscribeData(fileds[i], list[i], "#fffff"));
         }

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

@@ -0,0 +1,67 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaPersonMessageRule;
+import com.huiju.estateagents.mapper.TaPersonMessageRuleMapper;
+import com.huiju.estateagents.service.ITaPersonMessageRuleService;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 楼盘户型对应图片表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Service
+public class TaPersonMessageRuleImpl extends ServiceImpl<TaPersonMessageRuleMapper, TaPersonMessageRule> implements ITaPersonMessageRuleService {
+    @Autowired
+    private TaPersonMessageRuleMapper taPersonMessageRuleMapper;
+
+    @Override
+    public TaPersonMessageRule getByPersonAndType(String personId, String messageType, String contentType, Integer orgId) {
+        return taPersonMessageRuleMapper.getByPersonAndType(personId, messageType, contentType, orgId);
+    }
+
+    @Override
+    public TaPersonMessageRule saveOrUpdateByPersonAndMessage(String personId, String messageType, String contentType, Integer orgId) {
+        boolean success = false;
+        LocalDateTime now = LocalDateTime.now();
+        TaPersonMessageRule rule = getByPersonAndType(personId, messageType, contentType, orgId);
+
+        if (null == rule) {
+            // 没有信息则插入新记录
+            TaPersonMessageRule data = new TaPersonMessageRule();
+            data.setPersonId(personId);
+            data.setMessageType(messageType);
+            data.setContentType(contentType);
+            data.setOrgId(orgId);
+            data.setLimitNum(-1);   // 暂定 -1 是不限制
+            data.setLastSendTime(now);
+
+            success = save(data);
+            return success ? data : null;
+        } else {
+            // 有的话则更新记录
+            rule.setLastSendTime(now);
+
+            if (rule.getLimitNum() > -1) {
+                Integer left = rule.getLeftNum();
+                if (null == left || left <= 0) {
+                    left = 0;
+                } else {
+                    left -= 1;
+                }
+                rule.setLeftNum(left);
+            }
+
+            success = updateById(rule);
+            return success ? rule : null;
+        }
+    }
+}

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

@@ -400,11 +400,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
 
         // 找到销售经理，并推送消息
-        TaPerson saleMan = taPersonMapper.getSalesExecutive();
-        if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
-            // 发送消息
-            iMiniAppService.sendNewCustomerMessage(saleMan, CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
-        }
+//        TaPerson saleMan = taPersonMapper.getSalesExecutive();
+//        if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
+//            // 发送消息
+//            iMiniAppService.sendNewCustomerMessage(saleMan, CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
+//        }
 
         return ResponseBean.success(taRecommendCustomer);
     }

src/main/resources/mapper/TaPersonMessageRuleMapper.xml

@@ -0,0 +1,15 @@
+<?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.TaPersonMessageRuleMapper">
+    <select id="getByPersonAndType" resultType="com.huiju.estateagents.entity.TaPersonMessageRule">
+        SELECT
+            *
+        FROM
+            ta_person_message_rule t
+        WHERE t.person_id = #{personId}
+        AND t.message_type = #{messageType}
+        AND t.content_type = #{contentType}
+        AND t.org_id = #{orgId}
+        limit 1
+    </select>
+</mapper>