feats

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -241,4 +241,6 @@ public class TaUser implements Serializable {
 
     @TableField(exist = false)
     private String miniAppName;
+
+    private Boolean notShow;
 }

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

@@ -890,7 +890,12 @@ public class CommConstant {
     /**
      * 人员类型---财务
      */
-    public static final String FINANCE = "finance";
+    public static final String CONTACT_FINANCE = "finance";
+
+    /**
+     * 人员类型---售前
+     */
+    public static final String CONTACT_PRESALE = "pre-sale";
 
     /**
      * 审核状态-审核中

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

@@ -1,6 +1,9 @@
 package com.huiju.estateagents.common;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.config.SMSProperties;
+import com.huiju.estateagents.entity.SysSmsSetting;
+import com.huiju.estateagents.mapper.SysSmsSettingMapper;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +24,9 @@ public class SMSUtils {
 
     Hashtable<String, Phone> allPhones;
 
+    @Autowired
+    SysSmsSettingMapper sysSmsSettingMapper;
+
     @Autowired
     public SMSUtils(SMSProperties properties) {
         smsProperties = properties;
@@ -125,6 +131,31 @@ public class SMSUtils {
         return true;
     }
 
+    public void sendMessage(String tel, List<String> params, String type) throws Exception {
+        if (StringUtils.isEmpty(tel) || StringUtils.isEmpty(type)) {
+            throw new Exception("短信发送失败: 没有手机号或者短信模板");
+        }
+
+        QueryWrapper<SysSmsSetting> query = new QueryWrapper<>();
+        query.eq("sms_type", type);
+        query.eq("status", CommConstant.STATUS_NORMAL);
+        query.last("limit 1");
+
+        SysSmsSetting smsSetting = sysSmsSettingMapper.selectOne(query);
+        if (null == smsSetting) {
+            throw new Exception("没有设置有效的【" + type + "】短信模板");
+        }
+
+        params.add("橙蕉"); // 短信签名
+        String[] paramArr = new String[params.size()];
+        params.toArray(paramArr);
+
+        boolean success = sendMessage(smsSetting.getTplCode(), tel, paramArr);
+        if (!success) {
+            throw new Exception("短信发送失败");
+        }
+    }
+
     @Data
     public static class Phone {
         String tel;

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

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.DBUtils;
-import com.huiju.estateagents.common.DateUtils;
-import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.entity.TaOfficeContact;
 import com.huiju.estateagents.service.ITaOfficeContactService;
 import org.slf4j.Logger;
@@ -40,7 +37,6 @@ public class TaOfficeContactController extends BaseController {
     @Autowired
     public DBUtils dbUtils;
 
-
     /**
      * 分页查询列表
      * @param pageNum
@@ -94,6 +90,7 @@ public class TaOfficeContactController extends BaseController {
             taOfficeContact.setStatus(2);   // 待跟进
             if (iTaOfficeContactService.save(taOfficeContact)){
                 responseBean.addSuccess(taOfficeContact);
+                iTaOfficeContactService.sendNotice(taOfficeContact);
             }else {
                 responseBean.addError("fail");
             }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgAccountServiceImpl.java

@@ -424,7 +424,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
     @Override
     public List<TaContact> selectSmsContactUser(){
         QueryWrapper<TaContact> taContactQueryWrapper = new QueryWrapper<>();
-        taContactQueryWrapper.eq("contact_Type", CommConstant.FINANCE);
+        taContactQueryWrapper.eq("contact_Type", CommConstant.CONTACT_FINANCE);
         taContactQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
         List<TaContact> taContacts = taContactMapper.selectList(taContactQueryWrapper);
         return taContacts;

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -249,7 +249,7 @@ public class TaContactController extends BaseController {
             queryWrapper.like(!StringUtils.isEmpty(telephone), "telephone", telephone);
             queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
             queryWrapper.like(!StringUtils.isEmpty(job), "job", job);
-            queryWrapper.like("contact_type", CommConstant.FINANCE);
+            queryWrapper.like("contact_type", CommConstant.CONTACT_FINANCE);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no", "create_date");
 
@@ -275,7 +275,7 @@ public class TaContactController extends BaseController {
         try {
             TaContact taContact = new TaContact();
             taContact.setContactId(id);
-            taContact.setContactType(CommConstant.FINANCE);
+            taContact.setContactType(CommConstant.CONTACT_FINANCE);
             if (!StringUtils.isEmpty(contact.getOrderNo())){
                 taContact.setOrderNo(contact.getOrderNo());
             }

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaOfficeContactService extends IService<TaOfficeContact> {
 
+    void sendNotice(TaOfficeContact taOfficeContact);
 }

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

@@ -1,11 +1,21 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.SMSUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaOfficeContact;
 import com.huiju.estateagents.mapper.TaOfficeContactMapper;
+import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.sample.mapper.TaContactMapper;
 import com.huiju.estateagents.service.ITaOfficeContactService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 联系咨询  服务实现类
@@ -17,4 +27,34 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaOfficeContactServiceImpl extends ServiceImpl<TaOfficeContactMapper, TaOfficeContact> implements ITaOfficeContactService {
 
+    @Autowired
+    public SMSUtils smsUtils;
+
+    @Autowired
+    TaContactMapper taContactMapper;
+
+    @Override
+    public void sendNotice(TaOfficeContact taOfficeContact) {
+        List<String> params = new ArrayList<String>(){{
+            add(taOfficeContact.getName());
+            add(taOfficeContact.getPhone());
+            add(taOfficeContact.getCompany());
+        }};
+
+        QueryWrapper<TaContact> query = new QueryWrapper<>();
+        query.eq("contact_type", CommConstant.CONTACT_PRESALE);
+        query.eq("status", CommConstant.STATUS_NORMAL);
+
+        List<TaContact> taContacts = taContactMapper.selectList(query);
+        for (TaContact taContact : taContacts) {
+            String phone = taContact.getPhone();
+            if (!StringUtils.isEmpty(phone)) {
+                try {
+                    smsUtils.sendMessage(phone, params, "office-promotion");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 }

src/main/resources/mapper/TaUserMapper.xml

@@ -30,7 +30,7 @@
             left join ta_channel_app_relation n on o.org_id = n.org_id
             left join ta_channel_proxy z on z.channel_id = n.channel_id
         WHERE
-            t.is_admin =1
+            t.is_admin =1 AND ifnull(t.not_show, 0) != 1
             <if test="channelId != null and channelId != ''">
                 and n.channel_id = #{channelId}
             </if>