新需求

src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java

@@ -92,7 +92,13 @@ public class TaVisitorAppointmentController extends BaseController {
         TaWechatUser user = iTaWechatUserService.getById(Integer.valueOf(JWTUtils.getSubject(request)));
         SysUser sysUser = iSysUserService.getById(user.getPersonId());
         taVisitorAppointment.setCreateUser(sysUser.getUserId());
-        taVisitorAppointment.setCustomerType(CommConstant.IDENTITY_CHANNEL_MANAGER.equals(sysUser.getUserIdentity()) ? CommConstant.CUSTOMER_OF_CHANNEL : "");
+        String customerTypeString = "";
+        if (CommConstant.IDENTITY_CHANNEL_MANAGER.equals(sysUser.getUserIdentity())){
+            customerTypeString = CommConstant.CUSTOMER_OF_CHANNEL;
+        }else if (CommConstant.IDENTITY_PLANNING_MANAGER.equals(sysUser.getUserIdentity())){
+            customerTypeString = CommConstant.CUSTOMER_OF_PLANNING;
+        }
+        taVisitorAppointment.setCustomerType(customerTypeString);
 
         boolean success = taVisitorAppointmentService.save(taVisitorAppointment);
         if (success) {

src/main/java/com.huiju.welcome/mapper/TaVisitingLogMapper.java

@@ -26,4 +26,6 @@ public interface TaVisitingLogMapper extends BaseMapper<TaVisitingLog> {
     List<Map<String, Long>> getRegularClientTodayAmount();
 
     IPage<TaVisitingLog> getVisitingList(Page page, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("personId") Integer personId);
+	
+	List<TaVisitingLog> selectVisitingList(@Param("todayBegin") String todayBegin);
 }

src/main/java/com.huiju.welcome/service/ITaCustomerService.java

@@ -61,7 +61,7 @@ public interface ITaCustomerService extends IService<TaCustomer> {
     
     void sendMessageToBar(TaCustomer taCustomer,Integer personNum);
     
-    void notifyManager(TaCustomer taCustomer);
+    //void notifyManager(TaCustomer taCustomer);
     
     void sendMessageAll(TaFirstUsherRecord taFirstUsherRecord, TaCustomer taCustomer, TaMainUsherRecord taMainUsherRecord);
 

src/main/java/com.huiju.welcome/service/impl/MessageServiceImpl.java

@@ -33,15 +33,15 @@ public class MessageServiceImpl implements IMessageService {
 
     @Override
     public boolean notifyManager(TaCustomer taCustomer) {
-        // 置业经理或者渠道经理
-        String userIdentity = CommConstant.CUSTOMER_OF_CHANNEL.equals(taCustomer.getCustomerType()) ?
-                CommConstant.IDENTITY_CHANNEL_MANAGER : CommConstant.IDENTITY_CONSULTANT_MANAGER;
-
-        // 同时增加渠道总
-        List<String> identities = new ArrayList<String>(){{
-            add(userIdentity);
-//            add(CommConstant.IDENTITY_GENERAL_MANAGER);
-        }};
+        // 置业经理,渠道经理,策划经理
+        List<String> identities = new ArrayList<String>();
+        
+        if (CommConstant.CUSTOMER_OF_CHANNEL.equals(taCustomer.getCustomerType())){
+            identities.add(CommConstant.IDENTITY_CHANNEL_MANAGER);
+        }
+        identities.add(CommConstant.IDENTITY_CONSULTANT_MANAGER);
+        identities.add(CommConstant.IDENTITY_PLANNING_MANAGER);
+        identities.add(CommConstant.IDENTITY_GENERAL_MANAGER);
 
         // 推送给置业经理或者渠道经理 + 渠道总
         List<SysUser> sysUserList = sysUserMapper.filterByIdentities(identities);

src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java

@@ -176,6 +176,8 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         if (null != sysUser) {
             if (CommConstant.IDENTITY_CHANNEL_MANAGER.equals(sysUser.getUserIdentity())) {
                 taCustomer.setCustomerType(CommConstant.CUSTOMER_OF_CHANNEL);
+            }else if(CommConstant.IDENTITY_PLANNING_MANAGER.equals(sysUser.getUserIdentity())){
+                taCustomer.setCustomerType(CommConstant.CUSTOMER_OF_PLANNING);
             }
         }
         
@@ -627,7 +629,8 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     }
 
     @Override
-    public boolean updateByMainUsher(Integer customerId, JSONObject params) {
+    public boolean
+    updateByMainUsher(Integer customerId, JSONObject params) {
         if (null == customerId || customerId == 0) {
             return false;
         }
@@ -775,37 +778,37 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         } catch (Exception e) {}
     }
     
-    @Override
-    public void notifyManager(TaCustomer taCustomer) {
-        String userIdentity = CommConstant.CUSTOMER_OF_CHANNEL.equals(taCustomer.getCustomerType()) ?
-                CommConstant.IDENTITY_CHANNEL_MANAGER : CommConstant.IDENTITY_CONSULTANT_MANAGER;
-
-
-        //获取所有的置业经理信息并推送消息
-        List<SysUser> sysUserList = sysUserMapper.filterByIdentity(userIdentity);
-        sysUserList.stream().forEach(e -> {
-            String tpl = miniApp.getTpls().getVisitor();
-            String page = CommConstant.PAGE_MY_CUSTOMER + "?id=" + taCustomer.getCustomerId();
-            String openid = e.getOpenid();
-            if (null == openid) {
-                return;
-            }
-            List<Object> data = new ArrayList<Object>(){{
-                add(taCustomer.getCustomerName());
-                add(taCustomer.getPhone());
-                add("您有客户来访, 请及时接待!");
-            }};
-            
-//            miniApp.sendTPLMessage(tpl, openid, page, data);
-            if (miniApp.sendTPLMessage(tpl, openid, page, data).getCode() == -1) {
-                // 没有 formid 发短信
-                String phone = sysUserMapper.getPhoneByOpenid(openid);
-                if (null != phone) {
-                    smsUtils.sendVisitor(phone, null == taCustomer ? "": StringUtils.ifNull(taCustomer.getCustomerName(), ""));
-                }
-            }
-        });
-    }
+//    @Override
+//    public void notifyManager(TaCustomer taCustomer) {
+//        String userIdentity = CommConstant.CUSTOMER_OF_CHANNEL.equals(taCustomer.getCustomerType()) ?
+//                CommConstant.IDENTITY_CHANNEL_MANAGER : CommConstant.IDENTITY_CONSULTANT_MANAGER;
+//
+//
+//        //获取所有的置业经理信息并推送消息
+//        List<SysUser> sysUserList = sysUserMapper.filterByIdentity(userIdentity);
+//        sysUserList.stream().forEach(e -> {
+//            String tpl = miniApp.getTpls().getVisitor();
+//            String page = CommConstant.PAGE_MY_CUSTOMER + "?id=" + taCustomer.getCustomerId();
+//            String openid = e.getOpenid();
+//            if (null == openid) {
+//                return;
+//            }
+//            List<Object> data = new ArrayList<Object>(){{
+//                add(taCustomer.getCustomerName());
+//                add(taCustomer.getPhone());
+//                add("您有客户来访, 请及时接待!");
+//            }};
+//
+////            miniApp.sendTPLMessage(tpl, openid, page, data);
+//            if (miniApp.sendTPLMessage(tpl, openid, page, data).getCode() == -1) {
+//                // 没有 formid 发短信
+//                String phone = sysUserMapper.getPhoneByOpenid(openid);
+//                if (null != phone) {
+//                    smsUtils.sendVisitor(phone, null == taCustomer ? "": StringUtils.ifNull(taCustomer.getCustomerName(), ""));
+//                }
+//            }
+//        });
+//    }
     
     @Override
     public void sendMessageAll(TaFirstUsherRecord taFirstUsherRecord, TaCustomer taCustomer, TaMainUsherRecord taMainUsherRecord) {

src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java

@@ -692,7 +692,13 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
                 UsherRecordExcel item = new UsherRecordExcel();
                 item.setCustomerSource(customer.getSourceName());
-                item.setCustomerType(CommConstant.CUSTOMER_OF_CHANNEL.equals(customer.getCustomerType()) ? "渠道" : "自销");
+                String customerTypeString = "自销";
+                if (CommConstant.CUSTOMER_OF_CHANNEL.equals(customer.getCustomerType())){
+                    customerTypeString = "渠道";
+                }else if(CommConstant.CUSTOMER_OF_PLANNING.equals(customer.getCustomerType())){
+                    customerTypeString = "策划";
+                }
+                item.setCustomerType(customerTypeString);
                 item.setPersonName(customer.getPersonName());
                 item.setPersonNum(customer.getVisitorNum());;
                 item.setPhone(StringUtils.mixPhone(customer.getPhone()));

src/main/java/com.huiju.welcome/service/impl/TaVisitingLogServiceImpl.java

@@ -65,12 +65,8 @@ public class TaVisitingLogServiceImpl extends ServiceImpl<TaVisitingLogMapper, T
     public ResponseBean getTimeline() {
         LocalDateTime now = LocalDateTime.now();
         String todayBegin = DateUtils.localDatetime2day(now) + " 00:00:00";
-
-        QueryWrapper<TaVisitingLog> query4 = new QueryWrapper<>();
-        query4.ge("visite_date", todayBegin);
-        query4.groupBy("real_person");
-        query4.orderByDesc("visite_date");
-        List<TaVisitingLog> fourHourList = taVisitingLogMapper.selectList(query4);
+        
+        List<TaVisitingLog> fourHourList = taVisitingLogMapper.selectVisitingList(todayBegin);
 
         return ResponseBean.success(fourHourList);
     }

src/main/java/com.huiju.welcome/utils/CommConstant.java

@@ -16,12 +16,16 @@ public class CommConstant {
     public final static String IDENTITY_CHANNEL_MANAGER = "channel_manager";
     // 营销总
     public final static String IDENTITY_GENERAL_MANAGER = "general_manager";
+    //策划经理
+    public final static String IDENTITY_PLANNING_MANAGER = "planning_manager";
     //
     public final static String IDENTITY_ALL_USHER = "all-usher";
 
     // 正常客户, 类型是空
     // 渠道客户
     public final static String CUSTOMER_OF_CHANNEL = "channel";
+    //策划客户
+    public final static String CUSTOMER_OF_PLANNING = "planning";
 
     public final static String PAGE_MY_CUSTOMER = "pages/client/clientdetail/clientdetail";
     public final static String PAGE_MY_FIRSTUSHER = "pages/client/visitorDetail/visitorDetail";

src/main/resources/application.yml

@@ -1,12 +1,12 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-    username: welcome
-    password: s190QU2#z%hdU%^FPkY9qjls
-#    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-#    username: root
-#    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
+#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+#    username: welcome
+#    password: s190QU2#z%hdU%^FPkY9qjls
+    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
   servlet:
     multipart:
       max-file-size: 1024MB

src/main/resources/mapper/TaCustomerMapper.xml

@@ -104,9 +104,6 @@
             <if test="nameOrPhoneOrReceiver !=null and nameOrPhoneOrReceiver != ''">
               AND ( t.customer_name LIKE CONCAT('%',#{nameOrPhoneOrReceiver},'%') OR t.phone LIKE CONCAT('%',#{nameOrPhoneOrReceiver},'%') OR t.receiver LIKE CONCAT('%',#{nameOrPhoneOrReceiver},'%'))
             </if>
-            <if test='null != customerType and customerType == "normal"'>
-                AND IFNULL(t.customer_type, '') = ''
-            </if>
             <if test='null != customerType and customerType == "channel"'>
                 AND IFNULL(t.customer_type, '') = 'channel'
             </if>

src/main/resources/mapper/TaVisitingLogMapper.xml

@@ -79,4 +79,18 @@
                     count(*) > 1
             ) a
     </select>
+
+    <select id="selectVisitingList" resultType="com.huiju.welcome.model.TaVisitingLog">
+        SELECT
+            *
+        FROM
+            ta_visiting_log t
+        WHERE
+            NOT EXISTS ( SELECT * FROM ta_customer_map s WHERE t.person_id = s.person_id OR t.real_person = s.person_id )
+            AND visite_date >= #{todayBegin}
+        GROUP BY
+            real_person
+        ORDER BY
+            visite_date DESC
+    </select>
 </mapper>