人脸消息

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

@@ -259,7 +259,13 @@ public class TaCustomerController extends BaseController {
 
             List<TaPerson> group = iTaCustomerService.getGroup(cust.getCustomerId());
             cust.setGroup(group);
-
+            //插入车牌信息
+            QueryWrapper<TaCar> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("plate_number",cust.getPlateNumber());
+            TaCar taCar = iTaCarService.getOne(queryWrapper);
+            if (null != taCar){
+                cust.setCarImage(taCar.getCarImage());
+            }
             responseBean.addSuccess(cust);
         }catch (Exception e){
             e.printStackTrace();
@@ -327,7 +333,7 @@ public class TaCustomerController extends BaseController {
      * @return
      */
     @RequestMapping(value="/miniapp/customer/visitor/{state}",method= RequestMethod.GET)
-    public ResponseBean visitorCustomerList(@RequestParam(defaultValue = "1") int pageNumber,
+    public ResponseBean visitorCustomerList(@RequestParam(defaultValue = "1") int pageNum,
                                             @RequestParam(defaultValue = "10") int pageSize,
                                             @PathVariable String state,
                                             HttpServletRequest request){
@@ -341,10 +347,10 @@ public class TaCustomerController extends BaseController {
             }
             //已归属和未归属人员列表 分页
             if (state.equals(CommConstant.CUSTOMER_ATTRIBUTION)) {
-                IPage<TaCustomer> result = iTaCustomerService.getAttributionList(pageNumber, pageSize);
+                IPage<TaCustomer> result = iTaCustomerService.getAttributionList(pageNum, pageSize);
                 responseBean.addSuccess(result);
             }else if (state.equals(CommConstant.CUSTOMER_UNATTRIBUTION)){
-                IPage<TaCustomer> result = iTaCustomerService.getUnattributionList(pageNumber, pageSize);
+                IPage<TaCustomer> result = iTaCustomerService.getUnattributionList(pageNum, pageSize);
                 responseBean.addSuccess(result);
             }
             

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaFirstUsherRecord;
+import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaFirstUsherRecordService;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.StatusUtils;
@@ -14,6 +16,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
 
 /**
  * <p>
@@ -32,6 +38,8 @@ public class TaFirstUsherRecordController extends BaseController {
     @Autowired
     public ITaFirstUsherRecordService iTaFirstUsherRecordService;
 
+    @Autowired
+    private ITaCustomerService taCustomerService;
 
     /**
      * 保存对象
@@ -120,7 +128,30 @@ public class TaFirstUsherRecordController extends BaseController {
         }
         return responseBean;
     }
-
+    
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/miniapp/firstUsherRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean miniappGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaFirstUsherRecord taFirstUsherRecord = iTaFirstUsherRecordService.getById(id);
+            TaCustomer taCustomer = taCustomerService.getCutomerByPhoneAndPlatenumber(taFirstUsherRecord.getPhone(),taFirstUsherRecord.getPlateNumber());
+            if (null != taCustomer){
+                taFirstUsherRecord.setCustomerName(taCustomer.getCustomerName());
+                taFirstUsherRecord.setAvatar(taCustomer.getAvatar());
+                taFirstUsherRecord.setCustomerId(taCustomer.getCustomerId());
+            }
+            responseBean.addSuccess(taFirstUsherRecord);
+        }catch (Exception e){
+            logger.error("taFirstUsherRecordGetByID -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
     /**
      * 根据id查询对象
      */
@@ -147,8 +178,25 @@ public class TaFirstUsherRecordController extends BaseController {
             queryWrapper.lt(!done, "status", StatusUtils.BizDone);
         }
         queryWrapper.orderByDesc("rec_id");
-
+    
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        
         IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.page(pg, queryWrapper);
+        List<TaFirstUsherRecord> taFirstUsherRecordList = result.getRecords();
+        taFirstUsherRecordList.stream().forEach(e -> {
+            TaCustomer taCustomer = taCustomerService.getByPhoneOrPlate(e.getPhone(),e.getPlateNumber());
+            if (null != taCustomer){
+                if (formatter.format(taCustomer.getCreateDate()).equals(formatter.format(LocalDateTime.now()))){
+                    e.setNewCustomer(true);
+                }else {
+                    e.setNewCustomer(false);
+                }
+            }else {
+                e.setNewCustomer(true);
+            }
+        });
+    
+        result.setRecords(taFirstUsherRecordList);
 
 //            if (onlyNew) {
 //               iTaFirstUsherRecordService.updateNormal(result.getRecords());

src/main/java/com.huiju.welcome/model/TaCustomer.java

@@ -213,4 +213,10 @@ public class TaCustomer implements Serializable {
      */
     @TableField(exist = false)
     private LocalDateTime visiteDate;
+    
+    /**
+     * 车辆图片
+     */
+    @TableField(exist = false)
+    private String carImage;
 }

src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java

@@ -65,4 +65,16 @@ public class TaFirstUsherRecord implements Serializable {
     private Integer consultantId;
     
     private String realtyConsultant;
+    
+    @TableField(exist = false)
+    private String customerName;
+    
+    @TableField(exist = false)
+    private String avatar;
+    
+    @TableField(exist = false)
+    private Integer customerId;
+    
+    @TableField(exist = false)
+    private boolean newCustomer;
 }

src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java

@@ -76,4 +76,7 @@ public class TaMainUsherRecord implements Serializable {
 
     @TableField(exist = false)
     TaMainUsherRecord lastRecord;
+    
+    @TableField(exist = false)
+    private boolean newCustomer;
 }

src/main/java/com.huiju.welcome/model/TaPerson.java

@@ -1,6 +1,7 @@
 package com.huiju.welcome.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -2,6 +2,8 @@ package com.huiju.welcome.service;
 
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaDevice;
+import com.huiju.welcome.model.TaFirstUsherRecord;
+import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.model.TaPerson;
 import com.huiju.welcome.model.TaSnapshotPerson;
 
@@ -9,8 +11,4 @@ public interface ICameraService {
     String dispatchPerson(TaPerson taPerson, TaDevice ...devices);
 
     boolean newPersonByDevice(TaSnapshotPerson taSnapshotPerson);
-    
-    void sendMessageToBar(TaCustomer taCustomer,Integer personNum);
-    
-    void sendMessageToConsultManager(TaCustomer taCustomer);
 }

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

@@ -50,4 +50,14 @@ public interface ITaCustomerService extends IService<TaCustomer> {
 	IPage<TaCustomer> getAttributionList(int pageNumber, int pageSize);
     
     IPage<TaCustomer> getUnattributionList(int pageNumber, int pageSize);
+    
+    void notifyFirstUsherConsultantManager(TaFirstUsherRecord taFirstUsherRecord,TaCustomer taCustomer);
+    
+    TaCustomer getCutomerByPhoneAndPlatenumber(String phone, String plateNumber);
+    
+    void sendMessageToBar(TaCustomer taCustomer,Integer personNum);
+    
+    void sendMessageToConsultManager(TaCustomer taCustomer);
+    
+    void sendMessageAll(TaFirstUsherRecord taFirstUsherRecord, TaCustomer taCustomer, TaMainUsherRecord taMainUsherRecord);
 }

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

@@ -12,6 +12,8 @@ import com.huiju.welcome.model.SysUser;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaCustomerMap;
 import com.huiju.welcome.model.TaDevice;
+import com.huiju.welcome.model.TaFirstUsherRecord;
+import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.model.TaPerson;
 import com.huiju.welcome.model.TaSnapshotPerson;
 import com.huiju.welcome.service.*;
@@ -199,6 +201,7 @@ public class CameraServiceImpl implements ICameraService {
         TaDevice taDevice = taDeviceService.getById(taSnapshotPerson.getDeviceId());
         if(taDevice.getAfr().equals(CommConstant.DEVICE_AFR_UNFACE)){
             sendMessageToConsult(taPerson);
+            
     
             // 预写到访日志
             visitingLogService.newLogByDevice(taSnapshotPerson, taPerson);
@@ -213,10 +216,10 @@ public class CameraServiceImpl implements ICameraService {
             // 推送消息
             taPersonService.send2Front(taPerson);
         }
-
+    
         // 保存抓拍日志
         taSnapshotPersonService.save(taSnapshotPerson);
-
+        
         return true;
     }
     
@@ -233,65 +236,11 @@ public class CameraServiceImpl implements ICameraService {
                     //推送置业顾问
                     iTaCustomerService.notifyConsultant(taCustomer);
                     //推送置业经理
-                    sendMessageToConsultManager(taCustomer);
-                    //推送吧台
-                    sendMessageToBar(taCustomer,null);
+                    iTaCustomerService.sendMessageToConsultManager(taCustomer);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
         }
-        //推送人脸到二号岗
-        sendMessageToMainusher(taPerson);
-    }
-    
-    /**
-     * 推送人脸数据到二号岗
-     * @param taPerson
-     */
-    private void sendMessageToMainusher(TaPerson taPerson) {
-        try {
-            WebSocketServer.sendInfo(JSONObject.toJSONString(taPerson), CommConstant.WECHAT_CLIENT_MAINUSHER, null);
-        } catch (Exception e) {}
-    }
-    
-    /**
-     * 推送消息去吧台
-     * @param taCustomer
-     */
-    @Override
-    public void sendMessageToBar(TaCustomer taCustomer,Integer personNum) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("customerId",taCustomer.getCustomerId());
-        map.put("customerName",taCustomer.getCustomerName());
-        map.put("consultantName",taCustomer.getRealtyConsultant());
-        map.put("avatar",taCustomer.getAvatar());
-        map.put("visitorNum",personNum);
-        map.put("visitorTime",LocalDateTime.now());
-        map.put("type",CommConstant.IDENTITY_BARUSHER);
-        try {
-            WebSocketServer.sendInfo(JSONObject.toJSONString(map), CommConstant.WECHAT_CLIENT_MINIAPP, null);
-        } catch (Exception e) {}
-    }
-    
-    @Override
-    public void sendMessageToConsultManager(TaCustomer taCustomer) {
-        //获取所有的置业经理信息并推送消息
-        List<SysUser> sysUserList = sysUserMapper.selectConsultManagerList(CommConstant.IDENTITY_CONSULTANT_MANAGER);
-        sysUserList.stream().forEach(e -> {
-            String tpl = miniApp.getTpls().getVisitor();
-            String page = CommConstant.PAGE_MY_ATTRIBUTION + "?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);
-        });
     }
 }

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

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 
@@ -200,6 +201,15 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
 
         // 生成保安迎宾记录, 并通知小程序
         TaFirstUsherRecord taFirstUsherRecord = iTaFirstUsherRecordService.newRecordByDevice(taCarRecord,taCustomer);
+        if (null != taCustomer){
+            if (DateUtils.sameDay(taCustomer.getCreateDate(),LocalDateTime.now())){
+                taFirstUsherRecord.setNewCustomer(true);
+            }else {
+                taFirstUsherRecord.setNewCustomer(false);
+            }
+        }else {
+            taFirstUsherRecord.setNewCustomer(true);
+        }
         iTaFirstUsherRecordService.notifyCar(taFirstUsherRecord);
 
         // 如果客户有固定置业, 推送消息给置业
@@ -210,6 +220,14 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
                 log.error("发送消息给置业失败: {}", e.getMessage());
             }
         }
+        
+        //自动关联成功
+        if (null != taCustomer){
+            iTaCustomerService.sendMessageToConsultManager(taCustomer);
+        }
+        
+        //推送websocket消息。统一推送。
+        iTaCustomerService.sendMessageAll(taFirstUsherRecord,taCustomer,null);
 
         return true;
     }

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

@@ -1,10 +1,12 @@
 package com.huiju.welcome.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.common.WebSocketServer;
 import com.huiju.welcome.mapper.*;
 import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.*;
@@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -184,7 +187,54 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
 
         miniApp.sendTPLMessage(tpl, openid, page, data);
     }
-
+    
+    /**
+     * 推送车辆信息给置业经理
+     * @param taFirstUsherRecord
+     * @param taCustomer
+     * @throws Exception
+     */
+    @Override
+    public void notifyFirstUsherConsultantManager(TaFirstUsherRecord taFirstUsherRecord, TaCustomer taCustomer) {
+        List<SysUser> sysUserList = sysUserMapper.selectConsultManagerList(CommConstant.IDENTITY_CONSULTANT_MANAGER);
+        String message ="";
+        if (null != taCustomer){
+            if (null == taCustomer.getConsultantId()){
+                message = "请安排置业接待。";
+            }else{
+                SysUser sysUser = sysUserMapper.selectById(taCustomer.getConsultantId());
+                message = "置业"+sysUser.getUsername()+"客户，请安排接待";
+            }
+        }else {
+            message = "客户已到达, 请及时关注。";
+        }
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        
+        String visitData = formatter.format(taFirstUsherRecord.getVisiteDate());
+        List<Object> data = new ArrayList<Object>();
+        data.add(visitData);
+        data.add(taFirstUsherRecord.getPlateNumber()+" "+ taFirstUsherRecord.getColor() + " " + taFirstUsherRecord.getCarModel());
+        data.add(message);
+        sysUserList.stream().forEach(e -> {
+            String tpl = miniApp.getTpls().getFirstUsher();
+            String page = CommConstant.PAGE_MY_FIRSTUSHER + "?id=" + taFirstUsherRecord.getRecId();
+            String openid = e.getOpenid();
+            if (null == openid) {
+                return;
+            }
+            miniApp.sendTPLMessage(tpl, openid, page, data);
+        });
+    }
+    
+    @Override
+    public TaCustomer getCutomerByPhoneAndPlatenumber(String phone, String plateNumber) {
+        List<TaCustomer> list = taCustomerMapper.getSomeCustMayBe(plateNumber,phone);
+        if (list.size() > 0){
+            return list.get(0);
+        }
+        return null;
+    }
+    
     @Override
     public boolean updateConsultant(TaCustomer taCustomer, Integer consultantId) {
         SysUser usr = sysUserMapper.selectById(consultantId);
@@ -248,10 +298,10 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         }
     
         if (notify){
-            //通知吧台来人了
-            cameraService.sendMessageToBar(cust,taMainUsherRecord.getPersonNum());
+            //通知前端
+            sendMessageAll(null,cust,taMainUsherRecord);
             //推送置业经理
-            cameraService.sendMessageToConsultManager(cust);
+            sendMessageToConsultManager(cust);
         }
         
         return cust;
@@ -289,9 +339,13 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         }
         if (notify){
             //通知吧台来人了
-            cameraService.sendMessageToBar(cust,taFirstUsherRecord.getPersonNum());
+            sendMessageAll(taFirstUsherRecord,cust,null);
+            
+            //通知吧台人数等信息
+            sendMessageToBar(cust,taFirstUsherRecord.getPersonNum());
+            
             //推送置业经理
-            cameraService.sendMessageToConsultManager(cust);
+            sendMessageToConsultManager(cust);
         }
         
         return cust;
@@ -535,5 +589,65 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
 
         return taCustomerMapper.insert(taCustomer) > 0;
     }
+    
+    
+    
+    /**
+     * 推送消息去吧台
+     * @param taCustomer
+     */
+    @Override
+    public void sendMessageToBar(TaCustomer taCustomer,Integer personNum) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("customerId",taCustomer.getCustomerId());
+        map.put("customerName",taCustomer.getCustomerName());
+        map.put("consultantName",taCustomer.getRealtyConsultant());
+        map.put("avatar",taCustomer.getAvatar());
+        map.put("visitorNum",personNum);
+        map.put("visitorTime",LocalDateTime.now());
+        map.put("type",CommConstant.IDENTITY_BARUSHER);
+        try {
+            WebSocketServer.sendInfo(JSONObject.toJSONString(map), CommConstant.WECHAT_CLIENT_MINIAPP, null);
+        } catch (Exception e) {}
+    }
+    
+    @Override
+    public void sendMessageToConsultManager(TaCustomer taCustomer) {
+        //获取所有的置业经理信息并推送消息
+        List<SysUser> sysUserList = sysUserMapper.selectConsultManagerList(CommConstant.IDENTITY_CONSULTANT_MANAGER);
+        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);
+        });
+    }
+    
+    @Override
+    public void sendMessageAll(TaFirstUsherRecord taFirstUsherRecord, TaCustomer taCustomer, TaMainUsherRecord taMainUsherRecord) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("type",CommConstant.IDENTITY_ALL_USHER);
+        if (null != taFirstUsherRecord){
+            map.put("taFirstUsherRecord",taFirstUsherRecord);
+        }
+        if (null != taCustomer){
+            map.put("taCustomer",taCustomer);
+        }
+        if (null != taMainUsherRecord){
+            map.put("taMainUsherRecord",taMainUsherRecord);
+        }
+        try {
+            WebSocketServer.sendInfo(JSONObject.toJSONString(map), CommConstant.WECHAT_CLIENT_MINIAPP, null);
+        } catch (Exception e) {}
+    }
 
 }

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

@@ -83,6 +83,8 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
         if (null != taCustomer){
             taFirstUsherRecord.setConsultantId(taCustomer.getConsultantId());
             taFirstUsherRecord.setRealtyConsultant(taCustomer.getRealtyConsultant());
+            taFirstUsherRecord.setPhone(taCustomer.getPhone());
+            taFirstUsherRecord.setPersonName(taCustomer.getCustomerName());
         }
         
         taFirstUsherRecordMapper.insert(taFirstUsherRecord);
@@ -177,6 +179,10 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
             if (StringUtils.isEmpty(taMainUsherRecord.getPlateNumber())) {
                 taMainUsherRecord.setPlateNumber(taFirstUsherRecord.getPlateNumber());
             }
+            
+            if(null != taMainUsherRecord.getPersonNum()){
+                taMainUsherRecord.setPersonNum(taFirstUsherRecord.getPersonNum());
+            }
 
             iTaMainUsherRecordService.updateById(taMainUsherRecord);
         }
@@ -224,13 +230,19 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
                 if (null != taCustomer.getConsultantId()){
                     iTaCustomerService.notifyConsultant(taCustomer);
                 }
-                //通知吧台来人了
-                cameraService.sendMessageToBar(taCustomer,taFirstUsherRecord.getPersonNum());
-                //推送置业经理
-                cameraService.sendMessageToConsultManager(taCustomer);
+                //通知前端
+                iTaCustomerService.sendMessageAll(taFirstUsherRecord,taCustomer,null);
+                //通知置业经理车辆信息
+                iTaCustomerService.notifyConsultant(taCustomer);
             } catch (Exception e) {}
+        }else if(StringUtils.isEmpty(taFirstUsherRecord.getPhone())){
+            //有手机号的情况下会新建customer，推送后置
+            //通知置业经理车辆信息
+            iTaCustomerService.notifyFirstUsherConsultantManager(taFirstUsherRecord,taCustomer);
+            //通知前端
+            iTaCustomerService.sendMessageAll(taFirstUsherRecord,taCustomer,null);
         }
-
+        
         // 依据车牌判断是否老客户来访
         //if (!StringUtils.isEmpty(plateNumber)) {
         //    List<TaCustomer> taCustomerList = iTaCustomerService.getSomeCustMayBe(plateNumber);

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

@@ -273,10 +273,6 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
                 taCustomer = iTaCustomerService.getSameByPerson(personId);
             }
         }
-    
-        //if (null == taCustomer && null == taMainUsherRecord.getCustomerId()) {
-        //    taCustomer = iTaCustomerService.newCustByMainUsher(taMainUsherRecord, false);
-        //}
         
         if (null == taCustomer){
             // 新增客户
@@ -325,6 +321,9 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
                 if (!StringUtils.isEmpty(taMainUsherRecord.getColor())){
                     taMainUsherRecordToday.setColor(taMainUsherRecord.getColor());
                 }
+                if (!StringUtils.isEmpty(taMainUsherRecord.getAvatar())){
+                    taMainUsherRecordToday.setAvatar(taMainUsherRecord.getAvatar());
+                }
                 return updateByMiniapp(taMainUsherRecordToday);
             }
         }
@@ -369,7 +368,8 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
         // 是否需要更新客户信息
         // 只更新空内容
-        if (StringUtils.isEmpty(taCustomer.getCustomerName()) || StringUtils.isEmpty(taCustomer.getPhone())) {
+        if (StringUtils.isEmpty(taCustomer.getCustomerName()) || StringUtils.isEmpty(taCustomer.getPhone()) || StringUtils.isEmpty(taCustomer.getAvatar())
+             || StringUtils.isEmpty(taCustomer.getPlateNumber() )) {
             if (StringUtils.isEmpty(taCustomer.getCustomerName())) {
                 taCustomer.setCustomerName(taMainUsherRecord.getPersonName());
             }
@@ -442,11 +442,12 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             miniApp.sendTPLMessage(tplId, proxyOpenid, page, dt2);
         }
     
-        //通知吧台来人了
-        cameraService.sendMessageToBar(taCustomer,taMainUsherRecord.getPersonNum());
+        //通知前端
+        iTaCustomerService.sendMessageAll(null,taCustomer,taMainUsherRecord);
         //推送置业经理
-        cameraService.sendMessageToConsultManager(taCustomer);
-
+        iTaCustomerService.sendMessageToConsultManager(taCustomer);
+        //推送吧台
+        iTaCustomerService.sendMessageToBar(taCustomer,taMainUsherRecord.getPersonNum());
         return row > 0;
     }
 
@@ -472,6 +473,15 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         taMainUsherRecord.setStatus(StatusUtils.Ready);
         taMainUsherRecord.setPersonId(taPerson.getRealId());
         int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
+        if (null != taCustomer){
+            if (DateUtils.sameDay(taCustomer.getCreateDate(),LocalDateTime.now())){
+                taMainUsherRecord.setNewCustomer(true);
+            }else {
+                taMainUsherRecord.setNewCustomer(false);
+            }
+        }else {
+            taMainUsherRecord.setNewCustomer(true);
+        }
 
         try {
             Action act = Action.create(Action.TYPE_NEW_MAIN_USHER, JSONObject.toJSONString(taMainUsherRecord, SerializerFeature.WriteMapNullValue));
@@ -589,6 +599,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         taMainUsherRecord.setChannel(taFirstUsherRecord.getChannel());
         taMainUsherRecord.setPurpose(taFirstUsherRecord.getPurpose());
         taMainUsherRecord.setCarImage(taFirstUsherRecord.getCarImage());
+        taMainUsherRecord.setPersonNum(taFirstUsherRecord.getPersonNum());
 
         if (null != taCustomer) {
             taMainUsherRecord.setPersonId(taCustomer.getCustomerId());

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

@@ -6,9 +6,10 @@ public class CommConstant {
     public final static String IDENTITY_MAINUSHER = "main-usher";
     public final static String IDENTITY_BARUSHER = "bar-usher";
     public final static String IDENTITY_CONSULTANT_MANAGER = "consultant_manager";
+    public final static String IDENTITY_ALL_USHER = "all-usher";
 
     public final static String PAGE_MY_CUSTOMER = "pages/client/clientdetail/clientdetail";
-    public final static String PAGE_MY_ATTRIBUTION = "pages/client/visitorList/visitorList";
+    public final static String PAGE_MY_FIRSTUSHER = "pages/client/visitorDetail/visitorDetail";
 
     public final static String WECHAT_CLIENT_MINIAPP = "miniapp";
     public final static String WECHAT_CLIENT_CAR = "car";

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

@@ -101,5 +101,7 @@ public class MiniApp {
     @Data
     public static class Tpl {
         private String visitor;
+        
+        private String firstUsher;
     }
 }

src/main/resources/application.yml

@@ -50,6 +50,7 @@ miniapp:
   secret: 03fcb0228ada1dd27ba45fb5a64c6f52
   tpls:
     visitor: m5fR2X1D-iWUurRe-pQQU8VgcxSSZ5eAVoquMixphFw
+    firstUsher: DlpqippBqmqkWWLDxsxB7iIbhlD7px4TCnP2KcK7DY8
 
 # ali-cloud
 ali: