bug fix

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju.welcome</groupId>
 	<artifactId>mainbiz</artifactId>
-	<version>v4.0.1</version>
+	<version>v5.2.0</version>
 	<name>mainbiz</name>
 	<description>com.huiju.welcome main service</description>
 

src/main/java/com.huiju.welcome/config/SMSProperties.java

@@ -11,6 +11,7 @@ public class SMSProperties {
     String method;
     String contentType;
     Captcha captcha;
+    Visitor visitor;
 
     @Data
     public static class Template {
@@ -26,4 +27,9 @@ public class SMSProperties {
         Integer size;
         String sign;
     }
+
+    @Data
+    public static class Visitor {
+        String code;
+    }
 }

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

@@ -1,202 +1,203 @@
-package com.huiju.welcome.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.huiju.welcome.common.Action;
-import com.huiju.welcome.common.WebSocketServer;
-import com.huiju.welcome.common.base.ResponseBean;
-import com.huiju.welcome.model.*;
-import com.huiju.welcome.service.*;
-import com.huiju.welcome.utils.AliFaceUtils;
-import com.huiju.welcome.utils.AliOSSUtils;
-import com.huiju.welcome.utils.StatusUtils;
-import com.huiju.welcome.utils.XFYun;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.http.HttpStatus;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-import javax.websocket.server.PathParam;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author FXF
- * @date 2019-03-13
- */
-@RestController
-@RequestMapping("/")
-@Transactional(rollbackFor = Exception.class)
-public class CameraController {
-	private Logger log = LoggerFactory.getLogger(XFYun.class);
-
-	@Autowired
-	ITaDeviceService taDeviceService;
-	
-	@Autowired
-	private ISysParamService iSysParamService;
-
-	@Autowired
-	private ITaCarRecordService iTaCarRecordService;
-
-	@Autowired
-	private ICameraService cameraService;
-
-	@Autowired
-	private AliFaceUtils aliFaceUtils;
-
-	@GetMapping("/ping")
-	public String ping() {
-		return "pong";
-	}
-
-	@ApiOperation(value = "人脸对比结果上传", notes = "人脸对比结果上传")
-	@PostMapping(value = "/camera/{deviceId}/person")
-	public ResponseBean person(
-			@PathVariable String deviceId,
-			MultipartFile snapshot,
-			TaSnapshotPerson taSnapshotPerson,
-			HttpServletRequest request) {
-		ResponseBean responseBean = new ResponseBean();
-
-		if (null == deviceId || null == taSnapshotPerson) {
-			responseBean.addError(HttpStatus.SC_BAD_REQUEST, "设备ID 或者 抓拍参数传入方式不正确");
-			return responseBean;
-		}
-
-		if (!deviceId.equals(taSnapshotPerson.getDeviceId())) {
-			responseBean.addError(HttpStatus.SC_BAD_REQUEST, "设备ID 或者 抓拍参数传入不正确");
-			return responseBean;
-		}
-
-		taSnapshotPerson.setAvatar(getMultipartFile(snapshot));
-
-		// 抓拍时间为当前时间
-		taSnapshotPerson.setCreateDate(LocalDateTime.now());
-
-		cameraService.newPersonByDevice(taSnapshotPerson);
-		return responseBean;
-	}
-
-	@PostMapping("/camera/{deviceId}/face")
-	public ResponseBean face(
-			@PathVariable("deviceId") String deviceId,
-			@RequestParam(value = "avatar", required = false) MultipartFile avatar,
-			@RequestParam(value = "score", defaultValue = "0") Integer score
-	) {
-		if (avatar.isEmpty()) {
-			return ResponseBean.error("没有找到人脸信息", HttpStatus.SC_BAD_REQUEST);
-		}
-
-		// 上传阿里云OSS
-		String avatarURL = getMultipartFile(avatar);
-
-		// 人像质量最低值, 低于这个值的认为人脸抓拍失败, 取值范围 1 - 100
-		Float faceMinScore = iSysParamService.getFaceMinScore();
-		if (score < faceMinScore) {
-			log.error("人脸质量过低, 放弃本次抓拍人脸 {}", avatarURL);
-			return ResponseBean.success("");
-		}
-
-		TaSnapshotPerson taSnapshotPerson = new TaSnapshotPerson();
-
-		// 人脸比对检索
-		JSONObject result = null;
-		try {
-			result = aliFaceUtils.searchFace(avatarURL);
-		} catch (Exception e) {
-			log.error("比对人脸失败: {}", e.getMessage());
-			e.printStackTrace();
-			return ResponseBean.error("比对人脸失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
-		}
-
-		if (null != result) {
-			Float rate = result.getFloat("rate");
-			if (null == rate) {
-				log.error("比对人脸异常, 比对阈值结果为空");
-				rate = 0.0f;
-			} else {
-				rate *= 100;
-			}
-			Integer matchPerson = result.getInteger("personId");
-
-			taSnapshotPerson.setSimilarity(rate);
-			taSnapshotPerson.setMatchPerson(matchPerson);
-		} else {
-			taSnapshotPerson.setSimilarity(0f);
-		}
-
-		taSnapshotPerson.setCreateDate(LocalDateTime.now());
-		taSnapshotPerson.setStatus(StatusUtils.Normal);
-		taSnapshotPerson.setAvatar(avatarURL);
-		taSnapshotPerson.setDeviceId(deviceId);
-		taSnapshotPerson.setScore(score);
-
-		cameraService.newPersonByDevice(taSnapshotPerson);
-		return ResponseBean.success("");
-	}
-
-	@PostMapping(value = "/camera/{deviceId}/car")
-	public ResponseBean car(
-			@PathVariable("deviceId") String deviceId,
-			@RequestParam("sceneImage") MultipartFile carImage,
-			@RequestParam("licenseImage") MultipartFile licenseImage,
-			@RequestParam(value = "driverImage", required = false) MultipartFile driverImage,
-			@RequestParam(value = "copilotImage", required = false) MultipartFile copilotImage,
-			@RequestParam("plateNumber") String plateNumber,
-			@RequestParam("color") String color,
-			@RequestParam("carModel") String carModel
-			) {
-
-		TaCarRecord taCarRecord = new TaCarRecord();
-		taCarRecord.setPlateNumber(plateNumber);
-		taCarRecord.setColor(color);
-		taCarRecord.setCarModel(carModel);
-		taCarRecord.setCreateDate(LocalDateTime.now());
-
-		if (null != carImage && !carImage.isEmpty()) {
-			taCarRecord.setCarImage(getMultipartFile(carImage));
-		}
-		if (null != licenseImage && !licenseImage.isEmpty()) {
-			taCarRecord.setLicenseImage(getMultipartFile(licenseImage));
-		}
-		if (null != driverImage && !driverImage.isEmpty()) {
-			taCarRecord.setDriverImage(getMultipartFile(driverImage));
-		}
-		if (null != copilotImage && !copilotImage.isEmpty()) {
-			taCarRecord.setCopilotImage(getMultipartFile(copilotImage));
-		}
-
-		iTaCarRecordService.newRecordByDevice(taCarRecord);
-
-		return ResponseBean.success("");
-	}
-
-	// 获取上传单文件
-	private String getMultipartFile(MultipartFile f) {
-		try {
-			return AliOSSUtils.putObject(f);
-		} catch (IOException e) {
-			e.printStackTrace();
-			log.error("上传人脸至阿里云失败: " + e.getMessage());
-			return null;
-		}
-	}
-}
+package com.huiju.welcome.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.huiju.welcome.common.Action;
+import com.huiju.welcome.common.WebSocketServer;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.*;
+import com.huiju.welcome.service.*;
+import com.huiju.welcome.utils.AliFaceUtils;
+import com.huiju.welcome.utils.AliOSSUtils;
+import com.huiju.welcome.utils.StatusUtils;
+import com.huiju.welcome.utils.XFYun;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.http.HttpStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+import javax.websocket.server.PathParam;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2019-03-13
+ */
+@RestController
+@RequestMapping("/")
+@Transactional(rollbackFor = Exception.class)
+public class CameraController {
+	private Logger log = LoggerFactory.getLogger(XFYun.class);
+
+	@Autowired
+	ITaDeviceService taDeviceService;
+	
+	@Autowired
+	private ISysParamService iSysParamService;
+
+	@Autowired
+	private ITaCarRecordService iTaCarRecordService;
+
+	@Autowired
+	private ICameraService cameraService;
+
+	@Autowired
+	private AliFaceUtils aliFaceUtils;
+
+	@GetMapping("/ping")
+	public String ping() {
+		return "pong";
+	}
+
+	@ApiOperation(value = "人脸对比结果上传", notes = "人脸对比结果上传")
+	@PostMapping(value = "/camera/{deviceId}/person")
+	public ResponseBean person(
+			@PathVariable String deviceId,
+			MultipartFile snapshot,
+			TaSnapshotPerson taSnapshotPerson,
+			HttpServletRequest request) {
+		ResponseBean responseBean = new ResponseBean();
+
+		if (null == deviceId || null == taSnapshotPerson) {
+			responseBean.addError(HttpStatus.SC_BAD_REQUEST, "设备ID 或者 抓拍参数传入方式不正确");
+			return responseBean;
+		}
+
+		if (!deviceId.equals(taSnapshotPerson.getDeviceId())) {
+			responseBean.addError(HttpStatus.SC_BAD_REQUEST, "设备ID 或者 抓拍参数传入不正确");
+			return responseBean;
+		}
+
+		taSnapshotPerson.setAvatar(getMultipartFile(snapshot));
+
+		// 抓拍时间为当前时间
+		taSnapshotPerson.setCreateDate(LocalDateTime.now());
+
+		cameraService.newPersonByDevice(taSnapshotPerson);
+		return responseBean;
+	}
+
+	@PostMapping("/camera/{deviceId}/face")
+	public ResponseBean face(
+			@PathVariable("deviceId") String deviceId,
+			@RequestParam(value = "avatar", required = false) MultipartFile avatar,
+			@RequestParam(value = "score", defaultValue = "0") Integer score
+	) {
+		if (avatar.isEmpty()) {
+			return ResponseBean.error("没有找到人脸信息", HttpStatus.SC_BAD_REQUEST);
+		}
+
+		// 上传阿里云OSS
+		String avatarURL = getMultipartFile(avatar);
+
+		// 人像质量最低值, 低于这个值的认为人脸抓拍失败, 取值范围 1 - 100
+		Float faceMinScore = iSysParamService.getFaceMinScore();
+		if (score < faceMinScore) {
+			log.error("人脸质量过低, 放弃本次抓拍人脸 {}", avatarURL);
+			return ResponseBean.success("");
+		}
+
+		TaSnapshotPerson taSnapshotPerson = new TaSnapshotPerson();
+
+		// 人脸比对检索
+		JSONObject result = null;
+		try {
+			result = aliFaceUtils.searchFace(avatarURL);
+		} catch (Exception e) {
+			log.error("比对人脸失败: {}", e.getMessage());
+			e.printStackTrace();
+			return ResponseBean.error("比对人脸失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+		}
+
+		if (null != result) {
+			Float rate = result.getFloat("rate");
+			if (null == rate) {
+				log.error("比对人脸异常, 比对阈值结果为空");
+				rate = 0.0f;
+			}
+//			else {
+//				rate *= 100;
+//			}
+			Integer matchPerson = result.getInteger("personId");
+
+			taSnapshotPerson.setSimilarity(rate);
+			taSnapshotPerson.setMatchPerson(matchPerson);
+		} else {
+			taSnapshotPerson.setSimilarity(0f);
+		}
+
+		taSnapshotPerson.setCreateDate(LocalDateTime.now());
+		taSnapshotPerson.setStatus(StatusUtils.Normal);
+		taSnapshotPerson.setAvatar(avatarURL);
+		taSnapshotPerson.setDeviceId(deviceId);
+		taSnapshotPerson.setScore(score);
+
+		cameraService.newPersonByDevice(taSnapshotPerson);
+		return ResponseBean.success("");
+	}
+
+	@PostMapping(value = "/camera/{deviceId}/car")
+	public ResponseBean car(
+			@PathVariable("deviceId") String deviceId,
+			@RequestParam("sceneImage") MultipartFile carImage,
+			@RequestParam("licenseImage") MultipartFile licenseImage,
+			@RequestParam(value = "driverImage", required = false) MultipartFile driverImage,
+			@RequestParam(value = "copilotImage", required = false) MultipartFile copilotImage,
+			@RequestParam("plateNumber") String plateNumber,
+			@RequestParam("color") String color,
+			@RequestParam("carModel") String carModel
+			) {
+
+		TaCarRecord taCarRecord = new TaCarRecord();
+		taCarRecord.setPlateNumber(plateNumber);
+		taCarRecord.setColor(color);
+		taCarRecord.setCarModel(carModel);
+		taCarRecord.setCreateDate(LocalDateTime.now());
+
+		if (null != carImage && !carImage.isEmpty()) {
+			taCarRecord.setCarImage(getMultipartFile(carImage));
+		}
+		if (null != licenseImage && !licenseImage.isEmpty()) {
+			taCarRecord.setLicenseImage(getMultipartFile(licenseImage));
+		}
+		if (null != driverImage && !driverImage.isEmpty()) {
+			taCarRecord.setDriverImage(getMultipartFile(driverImage));
+		}
+		if (null != copilotImage && !copilotImage.isEmpty()) {
+			taCarRecord.setCopilotImage(getMultipartFile(copilotImage));
+		}
+
+		iTaCarRecordService.newRecordByDevice(taCarRecord);
+
+		return ResponseBean.success("");
+	}
+
+	// 获取上传单文件
+	private String getMultipartFile(MultipartFile f) {
+		try {
+			return AliOSSUtils.putObject(f);
+		} catch (IOException e) {
+			e.printStackTrace();
+			log.error("上传人脸至阿里云失败: " + e.getMessage());
+			return null;
+		}
+	}
+}

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();
@@ -287,7 +293,7 @@ public class TaCustomerController extends BaseController {
         @RequestParam(defaultValue = "1") int pageNumber,
         @RequestParam(defaultValue = "10") int pageSize,
         @RequestParam(defaultValue = "false") boolean mine,
-        @RequestParam(defaultValue = "") String nameOrPhone,
+        @RequestParam(defaultValue = "", name = "nameOrPhone") String nameOrPhoneOrReceiver,
         @RequestParam(defaultValue = "" ) Integer consultant,
         HttpServletRequest request
     ){
@@ -302,7 +308,7 @@ public class TaCustomerController extends BaseController {
                 consultantId = consultant;
             }
 
-            IPage<TaCustomer> result = iTaCustomerService.getCustomerListOfFront(pageNumber, pageSize, consultantId, nameOrPhone);
+            IPage<TaCustomer> result = iTaCustomerService.getCustomerListOfFront(pageNumber, pageSize, consultantId, nameOrPhoneOrReceiver);
             List<TaCustomer> custs = result.getRecords();
 
             if (null != custs && custs.size() > 0) {
@@ -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;
 
     /**
      * 保存对象
@@ -51,6 +59,7 @@ public class TaFirstUsherRecordController extends BaseController {
                 responseBean.addError("fail");
             }
         }catch (Exception e){
+            e.printStackTrace();
             logger.error("taFirstUsherRecordAdd -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
@@ -120,7 +129,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 +179,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/controller/TaMainUsherRecordController.java

@@ -53,6 +53,9 @@ public class TaMainUsherRecordController extends BaseController {
 
     @Autowired
     private ITaPersonService iTaPersonService;
+    
+    @Autowired
+    private ITaCustomerService taCustomerService;
 
     @Autowired
     private ITaCustomerService iTaCustomerService;
@@ -102,7 +105,7 @@ public class TaMainUsherRecordController extends BaseController {
     public ResponseBean update(@RequestBody TaMainUsherRecord taMainUsherRecord, @PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            iTaMainUsherRecordService.updateByMiniapp(taMainUsherRecord);
+            iTaMainUsherRecordService.updateByMiniapp(taMainUsherRecord, null);
         }catch (Exception e){
             logger.error("taMainUsherRecordUpdate -=- {}",e.toString());
             responseBean.addError(e.getMessage());
@@ -152,6 +155,17 @@ public class TaMainUsherRecordController extends BaseController {
         return ResponseBean.success("");
     }
 
+    @RequestMapping(value="/miniapp/today/mainUsherRecord",method= RequestMethod.GET)
+    public ResponseBean getTodayList() {
+        QueryWrapper<TaMainUsherRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge("visite_date", DateUtils.morning());
+        queryWrapper.isNotNull("customer_id");
+        queryWrapper.orderByDesc("visite_date");
+
+        List<TaMainUsherRecord> result = iTaMainUsherRecordService.list(queryWrapper);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 分页查询
      */
@@ -171,6 +185,7 @@ public class TaMainUsherRecordController extends BaseController {
         queryWrapper.ge(today, "visite_date", DateUtils.morning());
         queryWrapper.gt("rec_id", fromRec);
         queryWrapper.eq(null != customer && !"".equals(customer), "customer_id", customer);
+        queryWrapper.orderByDesc("visite_date");
 
         if (onlyNew) {
             queryWrapper.eq("status", StatusUtils.Ready);
@@ -197,6 +212,16 @@ public class TaMainUsherRecordController extends BaseController {
                 query.orderByDesc("visite_date");
                 query.last("limit 1");
                 rec.setLastRecord(iTaMainUsherRecordService.getOne(query));
+                TaCustomer taCustomer = taCustomerService.getByPhoneOrPlate(rec.getPhone(),rec.getPlateNumber());
+                if (null != taCustomer){
+                    if (DateUtils.sameDay(taCustomer.getCreateDate(), LocalDateTime.now())){
+                        rec.setNewCustomer(true);
+                    }else {
+                        rec.setNewCustomer(false);
+                    }
+                }else {
+                    rec.setNewCustomer(true);
+                }
             }
 
 //                if (onlyNew) {

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

@@ -56,16 +56,22 @@ public class TaWechatUserController extends BaseController {
     private SMSUtils smsUtils;
 
     @GetMapping("/login")
-    public ResponseBean login(@RequestParam String code) {
-        ResponseBean resp = miniApp.getOpenid(code);
-        if (resp.getCode() != 200) {
-            return resp;
+    public ResponseBean login(@RequestParam(value = "code",required = false) String code,@RequestParam(value = "openid",required = false) String openid) {
+        String sessionKey = "";
+        String unionId = "";
+        if (!StringUtils.isEmpty(code)){
+            ResponseBean resp = miniApp.getOpenid(code);
+            if (resp.getCode() != 200) {
+                return resp;
+            }
+    
+            JSONObject data = (JSONObject) resp.getData();
+            openid = data.getString("openid");
+            logger.info("登录人的openi的是：{}",openid);
+            sessionKey = data.getString("session_key");
+            unionId = data.getString("unionid");
         }
-
-        JSONObject data = (JSONObject) resp.getData();
-        String openid = data.getString("openid");
-        String sessionKey = data.getString("session_key");
-        String unionId = data.getString("unionid");
+        
         String appid = miniApp.getAppid();
 
         Map<String, Object> map = new HashMap<>();

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

@@ -27,4 +27,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     void fireUser(@Param("userId") Integer userId);
 	
 	List<SysUser> selectConsultManagerList(@Param("identityConsultantManager") String identityConsultantManager);
+
+    String getPhoneByOpenid(@Param("openid") String openid);
 }

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

@@ -26,7 +26,7 @@ public interface TaCustomerMapper extends BaseMapper<TaCustomer> {
 
     List<TaCustomer> getSomeCustMayBe(@Param("plateNumber") String plateNumber, @Param("phone") String phone);
 
-    IPage<TaCustomer> getCustomerListOfFront(IPage<TaCustomer> page,@Param("consultantId") Integer consultantId,@Param("nameOrPhone") String nameOrPhone);
+    IPage<TaCustomer> getCustomerListOfFront(IPage<TaCustomer> page,@Param("consultantId") Integer consultantId,@Param("nameOrPhoneOrReceiver") String nameOrPhoneOrReceiver);
     
     IPage<TaCustomer> getAttributionList(IPage<TaCustomer> page);
     

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

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

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

@@ -61,4 +61,20 @@ public class TaFirstUsherRecord implements Serializable {
     private String licenseImage;
 
     private String phone;
+    
+    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,9 @@ public class TaMainUsherRecord implements Serializable {
 
     @TableField(exist = false)
     TaMainUsherRecord lastRecord;
+    
+    @TableField(exist = false)
+    private boolean newCustomer;
+
+    private String receiver;
 }

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

@@ -45,11 +45,21 @@ public interface ITaCustomerService extends IService<TaCustomer> {
 
     TaCustomer getWithLastVisit(Integer id);
 
-    IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhone);
-
     List<CustomerExcel> getCustomersEqualCustomerPage(String customerName, String phone, String platNumber, Integer agentUserId);
+
+    IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhoneOrReceiver);
 	
 	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/ITaFirstUsherRecordService.java

@@ -3,10 +3,10 @@ package com.huiju.welcome.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.model.TaCarRecord;
+import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaFirstUsherRecord;
 
 import java.util.List;
-import java.util.Date;
 
 /**
  * <p>
@@ -25,7 +25,7 @@ public interface ITaFirstUsherRecordService extends IService<TaFirstUsherRecord>
 
     boolean updateNormal(List<TaFirstUsherRecord> records);
 
-    TaFirstUsherRecord newRecordByDevice(TaCarRecord taCarRecord);
+    TaFirstUsherRecord newRecordByDevice(TaCarRecord taCarRecord, TaCustomer taCustomer);
 
     void notifyMiniapp(TaFirstUsherRecord taFirstUsherRecord);
 

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

@@ -38,7 +38,7 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
 
     boolean newRecordByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception;
 
-    boolean updateByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception;
+    boolean updateByMiniapp(TaMainUsherRecord taMainUsherRecord, TaCustomer taCustomer) throws Exception;
 
     boolean deleteRecord(Integer id);
 
@@ -51,4 +51,6 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
     boolean updateMainUsherRecord(TaMainUsherRecord taMainUsherRecord, Integer customerId, String subject);
 
     TaMainUsherRecord newRecordByFirstUsher(TaFirstUsherRecord taFirstUsherRecord, TaCustomer taCustomer);
+
+    TaMainUsherRecord mergeAndDelete(TaMainUsherRecord source, TaMainUsherRecord target);
 }

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.*;
@@ -60,9 +62,6 @@ public class CameraServiceImpl implements ICameraService {
     @Autowired
     ITaCustomerService iTaCustomerService;
     
-    @Value("${unface.device}")
-    private String unfaceDevice;
-    
     @Autowired
     private TaCustomerMapMapper taCustomerMapMapper;
     
@@ -199,26 +198,28 @@ public class CameraServiceImpl implements ICameraService {
         }
 
         //二号岗设备推送
-        if(taSnapshotPerson.getDeviceId().equals(unfaceDevice)){
+        TaDevice taDevice = taDeviceService.getById(taSnapshotPerson.getDeviceId());
+        if(!taDevice.getAfr().equals(CommConstant.DEVICE_AFR_UNFACE)){
             sendMessageToConsult(taPerson);
+            
+    
+            // 预写到访日志
+            visitingLogService.newLogByDevice(taSnapshotPerson, taPerson);
+    
+            // 判断是否客户来访
+            try {
+                iTaCustomerService.judgeNewCust(taPerson);
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
         }else{
             // 推送消息
             taPersonService.send2Front(taPerson);
         }
-
+    
         // 保存抓拍日志
         taSnapshotPersonService.save(taSnapshotPerson);
-
-        // 预写到访日志
-        visitingLogService.newLogByDevice(taSnapshotPerson, taPerson);
-
-        // 判断是否客户来访
-        try {
-            iTaCustomerService.judgeNewCust(taPerson);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-        }
-
+        
         return true;
     }
     
@@ -234,67 +235,10 @@ public class CameraServiceImpl implements ICameraService {
                 try {
                     //推送置业顾问
                     iTaCustomerService.notifyConsultant(taCustomer);
-                    //推送置业经理
-                    sendMessageToConsultManager(taCustomer);
-                    //推送吧台
-                    sendMessageToBar(taCustomer,null);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+                } catch (Exception e) {}
+                //推送置业经理
+                iTaCustomerService.sendMessageToConsultManager(taCustomer);
             }
-        }else {
-            //推送人脸到二号岗
-            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_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);
-        });
-    }
 }

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;
 
@@ -199,7 +200,16 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
         iTaCarService.newCarByDevice(taCarRecord);
 
         // 生成保安迎宾记录, 并通知小程序
-        TaFirstUsherRecord taFirstUsherRecord = iTaFirstUsherRecordService.newRecordByDevice(taCarRecord);
+        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,16 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
                 log.error("发送消息给置业失败: {}", e.getMessage());
             }
         }
+        
+        //自动关联成功
+        if (null != taCustomer){
+            iTaCustomerService.sendMessageToConsultManager(taCustomer);
+            // 发送吧台 - 人数未知就是 0
+            iTaCustomerService.sendMessageToBar(taCustomer, 0);
+        }
+        
+        //推送websocket消息。车辆垃圾数据太多，不推送消息
+//        iTaCustomerService.sendMessageAll(taFirstUsherRecord,taCustomer,null);
 
         return true;
     }

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

@@ -1,23 +1,23 @@
 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.*;
-import com.huiju.welcome.utils.CommConstant;
-import com.huiju.welcome.utils.MiniApp;
-import com.huiju.welcome.utils.StatusUtils;
-import com.huiju.welcome.utils.StringUtils;
+import com.huiju.welcome.utils.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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;
@@ -77,6 +77,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     @Autowired
     ICameraService cameraService;
 
+    @Autowired
+    SMSUtils smsUtils;
+
     @Override
     public List<TaPerson> getGroup(Integer customerId) {
         return taCustomerMapMapper.getGroup(customerId);
@@ -147,7 +150,13 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         taCustomer.setCarModel(taCarRecord.getCarModel());
         taCustomer.setPlateNumber(taCarRecord.getPlateNumber());
         taCustomer.setConsultantId(consultantId);
-
+        if (null != consultantId){
+            SysUser usr = sysUserMapper.selectById(consultantId);
+            if (null != usr){
+                taCustomer.setRealtyConsultant(usr.getUsername());
+            }
+        }
+        
         TaPerson taPerson = iTaPersonService.newPersonByFront(taCustomer);
         taCustomer.setCustomerId(taPerson.getRealId());
 
@@ -176,9 +185,69 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
             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(), ""));
+            }
+        }
     }
-
+    
+    /**
+     * 推送车辆信息给置业经理
+     * @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);
+            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 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);
@@ -222,8 +291,10 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
             taMainUsherRecord.setCustomerId(cust.getCustomerId());
         } else {
             cust = taCustomerMapper.selectById(custId);
+            cust.setReceiver(taMainUsherRecord.getReceiver());
+            taCustomerMapper.updateById(cust);
         }
-        
+
         TaCustomerMap taCustomerMap = taCustomerMapMapper.getCustomerOf(personId);
         if (null == taCustomerMap) {
             TaCustomerMap custMap = new TaCustomerMap();
@@ -242,10 +313,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;
@@ -283,9 +354,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;
@@ -302,6 +377,8 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         taCustomer.setPurpose(taFirstUsherRecord.getPurpose());
         taCustomer.setStatus(StatusUtils.Normal);
         taCustomer.setCreateDate(LocalDateTime.now());
+        taCustomer.setConsultantId(taFirstUsherRecord.getConsultantId());
+        taCustomer.setRealtyConsultant(taFirstUsherRecord.getRealtyConsultant());
     
         return taCustomer;
     }
@@ -319,6 +396,8 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
             result.put("appointment", 1);
             result.put("name", appointments.get(0).getPersonName());
             result.put("consultantId", appointments.get(0).getCreateUser());
+            SysUser user= sysUserMapper.selectById(appointments.get(0).getCreateUser());
+            result.put("consultantName", user.getUsername());
             result.put("sex", appointments.get(0).getSex());
             result.put("plateNumber", appointments.get(0).getPlatNumber());
             result.put("customerId", "");
@@ -450,9 +529,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     }
 
     @Override
-    public IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhone) {
+    public IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhoneOrReceiver) {
         IPage<TaCustomer> page = new Page<>(pageNumber, pageSize);
-        return taCustomerMapper.getCustomerListOfFront(page, consultantId, nameOrPhone);
+        return taCustomerMapper.getCustomerListOfFront(page, consultantId, nameOrPhoneOrReceiver);
     }
 
     @Override
@@ -570,6 +649,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         taCustomer.setRealtyConsultant(taMainUsherRecord.getRealtyConsultant());
         taCustomer.setStatus(StatusUtils.Normal);
         taCustomer.setCreateDate(LocalDateTime.now());
+        taCustomer.setReceiver(taMainUsherRecord.getReceiver());
 
         return taCustomer;
     }
@@ -584,5 +664,72 @@ 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);
+            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) {
+        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

@@ -67,7 +67,7 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
     }
 
     @Override
-    public TaFirstUsherRecord newRecordByDevice(TaCarRecord taCarRecord) {
+    public TaFirstUsherRecord newRecordByDevice(TaCarRecord taCarRecord, TaCustomer taCustomer) {
         TaFirstUsherRecord taFirstUsherRecord = new TaFirstUsherRecord();
         taFirstUsherRecord.setStatus(StatusUtils.Ready);
         taFirstUsherRecord.setCarImage(taCarRecord.getCarImage());
@@ -80,7 +80,13 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
         taFirstUsherRecord.setPersonNum(taCarRecord.getPersonNum());
         taFirstUsherRecord.setDriverImage(taCarRecord.getDriverImage());
         taFirstUsherRecord.setLicenseImage(taCarRecord.getLicenseImage());
-
+        if (null != taCustomer){
+            taFirstUsherRecord.setConsultantId(taCustomer.getConsultantId());
+            taFirstUsherRecord.setRealtyConsultant(taCustomer.getRealtyConsultant());
+            taFirstUsherRecord.setPhone(taCustomer.getPhone());
+            taFirstUsherRecord.setPersonName(taCustomer.getCustomerName());
+        }
+        
         taFirstUsherRecordMapper.insert(taFirstUsherRecord);
 
         return taFirstUsherRecord;
@@ -126,7 +132,16 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
     private boolean updateOtherInfo(TaFirstUsherRecord taFirstUsherRecord) {
         // 更新车辆信息
         TaCar taCar = iTaCarService.getById(taFirstUsherRecord.getPlateNumber());
-        if (null != taFirstUsherRecord.getCarModel()) {
+        if (null == taCar) {
+            taCar = new TaCar();
+            taCar.setPlateNumber(taFirstUsherRecord.getPlateNumber());
+            taCar.setColor(taFirstUsherRecord.getColor());
+            taCar.setCarModel(taFirstUsherRecord.getCarModel());
+            taCar.setCarImage(taFirstUsherRecord.getCarImage());
+            taCar.setStatus(StatusUtils.Normal);
+            taCar.setTypeId(CommConstant.TYPE_CAR_NORMAL);
+            iTaCarService.save(taCar);
+        } else if (null != taFirstUsherRecord.getCarModel()) {
             taCar.setCarModel(taFirstUsherRecord.getCarModel());
             taCar.setColor(taFirstUsherRecord.getColor());
             iTaCarService.updateById(taCar);
@@ -173,6 +188,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);
         }
@@ -212,29 +231,47 @@ public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecor
 
     private void notifyConsultant(TaFirstUsherRecord taFirstUsherRecord) {
         String plateNumber = taFirstUsherRecord.getPlateNumber();
-//        String phone = taFirstUsherRecord.getPhone();
-
-//        TaCustomer taCustomer = iTaCustomerService.getByPhoneOrPlate(phone, plateNumber);
-//        if (null != taCustomer) {
-//            try {
-//                iTaCustomerService.notifyConsultant(taCustomer);
-//            } catch (Exception e) {}
-//        }
+        String phone = taFirstUsherRecord.getPhone();
 
-        // 依据车牌判断是否老客户来访
-        if (!StringUtils.isEmpty(plateNumber)) {
-            List<TaCustomer> taCustomerList = iTaCustomerService.getSomeCustMayBe(plateNumber);
-
-            // 一个车牌对应多个客户, 先随机找一条数据
-            if (null != taCustomerList && taCustomerList.size() > 0) {
-                TaCustomer taCustomer = taCustomerList.get(0);
-                try {
+        TaCustomer taCustomer = iTaCustomerService.getByPhoneOrPlate(phone, plateNumber);
+        if (null != taCustomer) {
+            try {
+                if (null != taCustomer.getConsultantId()){
                     iTaCustomerService.notifyConsultant(taCustomer);
-                    //通知吧台来人了
-                    cameraService.sendMessageToBar(taCustomer,taFirstUsherRecord.getPersonNum());
-                } catch (Exception e) {}
-            }
+                }
+                //通知前端
+                iTaCustomerService.sendMessageAll(taFirstUsherRecord,taCustomer,null);
+                //通知置业经理车辆信息
+                iTaCustomerService.notifyConsultant(taCustomer);
+                // 通知吧台
+                iTaCustomerService.sendMessageToBar(taCustomer, taFirstUsherRecord.getPersonNum());
+            } 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);
+        //
+        //    // 一个车牌对应多个客户, 先随机找一条数据
+        //    if (null != taCustomerList && taCustomerList.size() > 0) {
+        //        TaCustomer taCustomer = taCustomerList.get(0);
+        //        try {
+        //            if (null != taCustomer.getConsultantId()){
+        //                iTaCustomerService.notifyConsultant(taCustomer);
+        //            }
+        //            //通知吧台来人了
+        //            cameraService.sendMessageToBar(taCustomer,taFirstUsherRecord.getPersonNum());
+        //            //推送置业经理
+        //            cameraService.sendMessageToConsultManager(taCustomer);
+        //        } catch (Exception e) {}
+        //    }
+        //}
     }
 
     @Override

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

@@ -15,6 +15,7 @@ import com.huiju.welcome.model.*;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaMainUsherRecord;
+import com.huiju.welcome.service.ICameraService;
 import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.service.ITaPersonService;
@@ -38,6 +39,7 @@ import java.util.List;
 @Slf4j
 @Service
 public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordMapper, TaMainUsherRecord> implements ITaMainUsherRecordService {
+
     @Autowired
     private TaMainUsherRecordMapper taMainUsherRecordMapper;
 
@@ -67,6 +69,12 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
     @Autowired
     MiniApp miniApp;
+    
+    @Autowired
+    ICameraService cameraService;
+
+    @Autowired
+    SMSUtils smsUtils;
 
     @Override
     public boolean updateNormal(List<TaMainUsherRecord> records) {
@@ -201,7 +209,14 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
                 add("您有新客户来访, 请及时接待!");
             }};
 
-            miniApp.sendTPLMessage(tplId, openid, page, data);
+//            miniApp.sendTPLMessage(tplId, openid, page, data);
+            if (miniApp.sendTPLMessage(tplId, openid, page, data).getCode() == -1) {
+                // 没有 formid 发短信
+                String tel = sysUserMapper.getPhoneByOpenid(openid);
+                if (null != tel) {
+                    smsUtils.sendVisitor(tel, StringUtils.ifNull(visitorName, ""));
+                }
+            }
         } else {
             // 否则, 给原置业发消息, 给接待置业发消息
 
@@ -217,9 +232,14 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
                 add(phone);
                 add("您有新客户来访, 已被安排给 " + usr1.getUsername() + " 接待!");
             }};
-            miniApp.sendTPLMessage(tplId, rcOpenid, page, dt1);
-
-
+//            miniApp.sendTPLMessage(tplId, rcOpenid, page, dt1);
+            if (miniApp.sendTPLMessage(tplId, rcOpenid, page, dt1).getCode() == -1) {
+                // 没有 formid 发短信
+                String tel = sysUserMapper.getPhoneByOpenid(rcOpenid);
+                if (null != tel) {
+                    smsUtils.sendVisitor(tel, StringUtils.ifNull(visitorName, ""));
+                }
+            }
 
             // 代理置业
             SysUser usr2 = sysUserMapper.selectById(realConsultant);
@@ -228,7 +248,14 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
                 add(phone);
                 add(usr2.getUsername() + " 有新客户来访, 请协助接待一下!");
             }};
-            miniApp.sendTPLMessage(tplId, openid, page, dt2);
+//            miniApp.sendTPLMessage(tplId, openid, page, dt2);
+            if (miniApp.sendTPLMessage(tplId, openid, page, dt2).getCode() == -1) {
+                // 没有 formid 发短信
+                String tel = sysUserMapper.getPhoneByOpenid(openid);
+                if (null != tel) {
+                    smsUtils.sendVisitor(tel, StringUtils.ifNull(visitorName, ""));
+                }
+            }
         }
     }
 
@@ -243,97 +270,98 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
     @Override
     public boolean newRecordByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception {
-        Integer consultantId = taMainUsherRecord.getConsultantId();
-        if (null == consultantId || consultantId < 1) {
-            throw new Exception("置业顾问不能为空");
-        }
+//        Integer consultantId = taMainUsherRecord.getConsultantId();
+        //if (null == consultantId || consultantId < 1) {
+        //    throw new Exception("置业顾问不能为空");
+        //}
 
         if (StringUtils.isEmpty(taMainUsherRecord.getPhone())) {
             throw new Exception("客户电话不能为空");
         }
 
+        TaCustomer taCustomer = getOrNewCustomerBy(taMainUsherRecord);
         taMainUsherRecord.setStatus(StatusUtils.Normal);
+        taMainUsherRecord.setVisiteDate(LocalDateTime.now());
+        taMainUsherRecord.setCustomerId(taCustomer.getCustomerId());
 
-        // 新增客户
-        iTaCustomerService.newCustByMainUsher(taMainUsherRecord, true);
+        TaMainUsherRecord taMainUsherRecordToday = getTodayRecord(taCustomer.getCustomerId());
 
-        return taMainUsherRecordMapper.insert(taMainUsherRecord) > 0;
-    }
+        if (null == taMainUsherRecordToday) {
+            int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
+            if (row < 1) {
+                log.error("新增跟进记录失败");
+                return false;
+            }
+            return updateByMiniapp(taMainUsherRecord, taCustomer);
+        }else {
+//            taMainUsherRecordToday = newRecordByCust(taCustomer, sysUserMapper.selectById(taCustomer.getConsultantId()));
+            if (!StringUtils.isEmpty(taMainUsherRecord.getPhone())){
+                taMainUsherRecordToday.setPhone(taMainUsherRecord.getPhone());
+            }
 
-    @Override
-    public boolean updateByMiniapp(TaMainUsherRecord taMainUsherRecord) throws Exception {
-        Integer consultantId = taMainUsherRecord.getConsultantId();
-        if (null == consultantId || consultantId < 1) {
-            throw new Exception("置业顾问不能为空");
+            if (!StringUtils.isEmpty(taMainUsherRecord.getPersonName())){
+                taMainUsherRecordToday.setPersonName(taMainUsherRecord.getPersonName());
+            }
+            if (!StringUtils.isEmpty(taMainUsherRecord.getPurpose())){
+                taMainUsherRecordToday.setPurpose(taMainUsherRecord.getPurpose());
+            }
+            if (!taMainUsherRecord.getAppointment()){
+                taMainUsherRecordToday.setAppointment(taMainUsherRecord.getAppointment());
+                taMainUsherRecordToday.setAppointmentId(taMainUsherRecord.getAppointmentId());
+            }
+            if (null != taMainUsherRecord.getPersonNum()){
+                taMainUsherRecordToday.setPersonNum(taMainUsherRecord.getPersonNum());
+            }
+            if (!StringUtils.isEmpty(taMainUsherRecord.getCarModel())){
+                taMainUsherRecordToday.setCarModel(taMainUsherRecord.getCarModel());
+            }
+            if (!StringUtils.isEmpty(taMainUsherRecord.getPlateNumber())){
+                taMainUsherRecordToday.setPlateNumber(taMainUsherRecord.getPlateNumber());
+            }
+            if (!StringUtils.isEmpty(taMainUsherRecord.getColor())){
+                taMainUsherRecordToday.setColor(taMainUsherRecord.getColor());
+            }
+            if (!StringUtils.isEmpty(taMainUsherRecord.getAvatar())){
+                taMainUsherRecordToday.setAvatar(taMainUsherRecord.getAvatar());
+            }
+
+            // todo 可能有问题
+            taMainUsherRecordToday.setReceiver(taMainUsherRecord.getReceiver());
+
+            return updateByMiniapp(taMainUsherRecordToday, taCustomer);
         }
+    }
 
+    @Override
+    public boolean updateByMiniapp(TaMainUsherRecord taMainUsherRecord, TaCustomer taCustomer) throws Exception {
         if (StringUtils.isEmpty(taMainUsherRecord.getPhone())) {
             throw new Exception("客户电话不能为空");
         }
 
-        taMainUsherRecord.setStatus(StatusUtils.Normal);
-
-        // 是否更新了置业
-        TaCustomer taCustomer = null;
-        if (null != taMainUsherRecord.getCustomerId()) {
-            taCustomer = iTaCustomerService.getById(taMainUsherRecord.getCustomerId());
-        } else if (null != taMainUsherRecord.getPhone() || null != taMainUsherRecord.getPlateNumber()) {
-            // 尝试使用手机号去查找
-            taCustomer = iTaCustomerService.getByPhoneOrPlate(taMainUsherRecord.getPhone(), taMainUsherRecord.getPlateNumber());
-        } else if (null != taMainUsherRecord.getAvatar()) {
-            // 依据人脸查询
-            JSONObject result = aliFaceUtils.searchFace(taMainUsherRecord.getAvatar());
-            if (null != result) {
-                Integer personId = Integer.valueOf(result.getString("personId"));
-                taCustomer = iTaCustomerService.getSameByPerson(personId);
-            }
+        if (null == taCustomer) {
+            taCustomer = getOrNewCustomerBy(taMainUsherRecord);
         }
 
-        if (null == taCustomer && null == taMainUsherRecord.getCustomerId()) {
-            taCustomer = iTaCustomerService.newCustByMainUsher(taMainUsherRecord, false);
+        taMainUsherRecord.setStatus(StatusUtils.Normal);
+        taMainUsherRecord.setVisiteDate(LocalDateTime.now());
+        taMainUsherRecord.setCustomerId(taCustomer.getCustomerId());
+        int row = 0;
+        if (null == taMainUsherRecord.getRecId()) {
+            row = taMainUsherRecordMapper.insert(taMainUsherRecord);
+        } else {
+            row = taMainUsherRecordMapper.updateById(taMainUsherRecord);
         }
 
+        Integer consultantId = taMainUsherRecord.getConsultantId();
         Integer originConsultant = taCustomer.getConsultantId();
 
-        // 是否需要更新客户信息
-        // 只更新空内容
-        if (StringUtils.isEmpty(taCustomer.getCustomerName()) || StringUtils.isEmpty(taCustomer.getPhone())) {
-            if (StringUtils.isEmpty(taCustomer.getCustomerName())) {
-                taCustomer.setCustomerName(taMainUsherRecord.getPersonName());
-            }
-
-            if (StringUtils.isEmpty(taCustomer.getPhone())) {
-                taCustomer.setPhone(taMainUsherRecord.getPhone());
-            }
-
-            if (null == taCustomer.getSex()) {
-                taCustomer.setSex(taMainUsherRecord.getSex());
-            }
-
-            if (StringUtils.isEmpty(taCustomer.getAvatar())) {
-                taCustomer.setAvatar(taMainUsherRecord.getAvatar());
-            }
-
-            if (StringUtils.isEmpty(taCustomer.getPlateNumber())) {
-                taCustomer.setPlateNumber(taMainUsherRecord.getPlateNumber());
-            }
-
-            if (StringUtils.isEmpty(taCustomer.getCarModel())) {
-                taCustomer.setCarModel(taMainUsherRecord.getCarModel());
-            }
-
-            iTaCustomerService.updateById(taCustomer);
-        }
-
-        int row = taMainUsherRecordMapper.updateById(taMainUsherRecord);
-
         // 更新人员信息
         iTaPersonService.updateByMainUsher(taMainUsherRecord);
 
         // 如果原来置业为空
         if (null == originConsultant || originConsultant < 1) {
             iTaCustomerService.updateConsultant(taCustomer, consultantId);
-        } else if (!consultantId.equals(originConsultant)) {
+        } else if (null != consultantId && !consultantId.equals(originConsultant)) {
             // 如果临时替换跟踪置业
             // 那么需要给原始置业, 以及临时置业各自发一条消息
             String page = CommConstant.PAGE_MY_CUSTOMER + "?id=" + String.valueOf(taCustomer.getCustomerId());
@@ -359,7 +387,13 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             dt1.add(taCustomer.getPhone());
             dt1.add("您有新客户来访, 已被安排给 " + proxyUser.getUsername() + " 接待!");
 
-            miniApp.sendTPLMessage(tplId, rcOpenid, page, dt1);
+//            miniApp.sendTPLMessage(tplId, rcOpenid, page, dt1);
+            if (miniApp.sendTPLMessage(tplId, rcOpenid, page, dt1).getCode() == -1) {                // 没有 formid 发短信
+                String phone = sysUserMapper.getPhoneByOpenid(rcOpenid);
+                if (null != phone) {
+                    smsUtils.sendVisitor(phone, StringUtils.ifNull(taCustomer.getCustomerName(), ""));
+                }
+            }
 
             // 通知临时置业
             List<Object> dt2 = new ArrayList<Object>();
@@ -367,12 +401,83 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
             dt2.add(taCustomer.getPhone());
             dt2.add(rcUser.getUsername() + " 有新客户来访, 请协助接待一下!");
 
-            miniApp.sendTPLMessage(tplId, proxyOpenid, page, dt2);
+//            miniApp.sendTPLMessage(tplId, proxyOpenid, page, dt2);
+            if (miniApp.sendTPLMessage(tplId, proxyOpenid, page, dt2).getCode() == -1) {                // 没有 formid 发短信
+                String phone = sysUserMapper.getPhoneByOpenid(proxyOpenid);
+                if (null != phone) {
+                    smsUtils.sendVisitor(phone, StringUtils.ifNull(taCustomer.getCustomerName(), ""));
+                }
+            }
         }
-
+    
+        //通知前端
+        iTaCustomerService.sendMessageAll(null,taCustomer,taMainUsherRecord);
+        //推送置业经理
+        iTaCustomerService.sendMessageToConsultManager(taCustomer);
+        //推送吧台
+        iTaCustomerService.sendMessageToBar(taCustomer,taMainUsherRecord.getPersonNum());
         return row > 0;
     }
 
+    private TaCustomer getOrNewCustomerBy(TaMainUsherRecord taMainUsherRecord) throws Exception {
+        // 是否更新了置业
+        TaCustomer taCustomer = null;
+        if (null != taMainUsherRecord.getCustomerId()) {
+            taCustomer = iTaCustomerService.getById(taMainUsherRecord.getCustomerId());
+        } else if (null != taMainUsherRecord.getPhone() || null != taMainUsherRecord.getPlateNumber()) {
+            // 尝试使用手机号去查找
+            taCustomer = iTaCustomerService.getByPhoneOrPlate(taMainUsherRecord.getPhone(), taMainUsherRecord.getPlateNumber());
+        } else if (null != taMainUsherRecord.getPersonId()) {
+            // 依据人员ID 查询
+            TaPerson taPerson = iTaPersonService.getById(taMainUsherRecord.getPersonId());
+            taCustomer = taCustomerMapper.getCustomerOf(taPerson.getPersonId(), taPerson.getRealId());
+        }
+
+        if (null != taMainUsherRecord.getAvatar() && null == taCustomer) {
+            // 依据人脸查询
+            JSONObject result = aliFaceUtils.searchFace(taMainUsherRecord.getAvatar());
+            if (null != result) {
+                Integer personId = Integer.valueOf(result.getString("personId"));
+                taCustomer = iTaCustomerService.getSameByPerson(personId);
+            }
+        }
+
+        if (null == taCustomer) {
+            taCustomer = iTaCustomerService.newCustByMainUsher(taMainUsherRecord, true);
+        } else {
+            // 是否需要更新客户信息
+            // 只更新空内容
+            taCustomer.setReceiver(taMainUsherRecord.getReceiver());
+            if (StringUtils.isEmpty(taCustomer.getCustomerName())) {
+                taCustomer.setCustomerName(taMainUsherRecord.getPersonName());
+            }
+
+            if (StringUtils.isEmpty(taCustomer.getPhone())) {
+                taCustomer.setPhone(taMainUsherRecord.getPhone());
+            }
+
+            if (null == taCustomer.getSex()) {
+                taCustomer.setSex(taMainUsherRecord.getSex());
+            }
+
+            if (StringUtils.isEmpty(taCustomer.getAvatar())) {
+                taCustomer.setAvatar(taMainUsherRecord.getAvatar());
+            }
+
+            if (StringUtils.isEmpty(taCustomer.getPlateNumber())) {
+                taCustomer.setPlateNumber(taMainUsherRecord.getPlateNumber());
+            }
+
+            if (StringUtils.isEmpty(taCustomer.getCarModel())) {
+                taCustomer.setCarModel(taMainUsherRecord.getCarModel());
+            }
+
+            iTaCustomerService.updateById(taCustomer);
+        }
+
+        return taCustomer;
+    }
+
     @Override
     public boolean deleteRecord(Integer id) {
         UpdateWrapper<TaMainUsherRecord> updateWrapper = new UpdateWrapper<>();
@@ -395,6 +500,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));
@@ -512,6 +626,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());
@@ -527,6 +642,28 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         return taMainUsherRecord;
     }
 
+    /**
+     * 合并 source 到 target, 并且删除 source
+     * @param source
+     * @param target
+     * @return
+     */
+    @Override
+    public TaMainUsherRecord mergeAndDelete(TaMainUsherRecord source, TaMainUsherRecord target) {
+        if (null == source) return target;
+        if (null == target) return source;
+
+        // 合并为空的字段
+        target.setPersonId(ifIntNvl(target.getPersonId(), source.getPersonId()));
+        target.setPersonName(StringUtils.ifNull(target.getPersonName(), source.getPersonName()));
+
+        return null;
+    }
+
+    private Integer ifIntNvl(Integer a, Integer b) {
+        return null == a ? b : a;
+    }
+
     private TaMainUsherRecord newRecordByPerson(TaPerson taPerson) {
         TaMainUsherRecord taMainUsherRecord = new TaMainUsherRecord();
         taMainUsherRecord.setPersonName(taPerson.getName());

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

@@ -6,8 +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_FIRSTUSHER = "pages/client/visitorDetail/visitorDetail";
 
     public final static String WECHAT_CLIENT_MINIAPP = "miniapp";
     public final static String WECHAT_CLIENT_CAR = "car";
@@ -17,6 +19,8 @@ public class CommConstant {
     public final static Integer TYPE_NEW_PERSON = 1;
     public final static Integer TYPE_VIP_PERSON = 2;
     public final static Integer TYPE_INNER_PERSON = 3;
+    
+    public final static String DEVICE_AFR_UNFACE = "0";
 
     public final static String TYPE_CAR_NORMAL = "normal";
     public final static String TYPE_CAR_INNER = "inner";

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

@@ -65,7 +65,8 @@ public class MiniApp {
 
         String formId = iTaMiniFormidsService.getFormidBy(toUser, true);
         if (null == formId) {
-            return ResponseBean.error("发送模板消息失败, 没有可用的 formid ", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+            return ResponseBean.error("没有可用的 formid", -1);
+//            return ResponseBean.error("发送模板消息失败, 没有可用的 formid ", HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
 
         String api = String.format("/api/%s/tpl/%s/form/%s/to/%s", appid, tplId, formId, toUser);
@@ -101,5 +102,7 @@ public class MiniApp {
     @Data
     public static class Tpl {
         private String visitor;
+        
+        private String firstUsher;
     }
 }

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

@@ -79,6 +79,13 @@ public class SMSUtils {
         return true;
     }
 
+    public boolean sendVisitor(String tel, String name) {
+        log.info("发送手机 {} 客户名称 {}", tel, name);
+
+        String[] params = { name };
+        return sendMessage(smsProperties.getVisitor().getCode(), tel, params);
+    }
+
     private String genCaptcha(int length) {
         List<String> nums = new ArrayList<>();
         for (int i = 0; i < length; i ++) {

src/main/resources/application.yml

@@ -50,6 +50,7 @@ miniapp:
   secret: 03fcb0228ada1dd27ba45fb5a64c6f52
   tpls:
     visitor: m5fR2X1D-iWUurRe-pQQU8VgcxSSZ5eAVoquMixphFw
+    firstUsher: DlpqippBqmqkWWLDxsxB7iIbhlD7px4TCnP2KcK7DY8
 
 # ali-cloud
 ali:
@@ -96,6 +97,5 @@ sms:
     # 短信签名
     sign: AI智慧案场
 
-# 二号岗设备不具备人脸比对功能
-unface:
-  device: 216
+  visitor:
+    code: "0501"

src/main/resources/mapper/SysUserMapper.xml

@@ -32,4 +32,15 @@
             AND s.user_identity = #{identityConsultantManager}
             AND s.STATUS = 1
     </select>
+
+    <select id="getPhoneByOpenid" resultType="String">
+      SELECT
+        t.phone
+      FROM
+        sys_user t
+        JOIN ta_wechat_user s ON s.person_id = t.user_id
+      WHERE
+        s.openid = #{openid}
+        LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/TaCustomerMapper.xml

@@ -83,18 +83,29 @@
 
     <select id="getCustomerListOfFront" resultType="com.huiju.welcome.model.TaCustomer">
         SELECT
-            *
+            t.*,
+            s.visite_date
         FROM
             ta_customer t
+        LEFT JOIN (
+            SELECT
+                a.customer_id,
+                max( b.visite_date ) as visite_date
+            FROM
+              ta_customer a
+            LEFT JOIN ta_main_usher_record b USING ( customer_id )
+            GROUP BY
+              a.customer_id
+            ) s USING ( customer_id )
         WHERE t.status &gt; 0
             <if test="consultantId !=null">
               AND t.consultant_id = #{consultantId}
             </if>
-            <if test="nameOrPhone !=null and nameOrPhone != ''">
-              AND ( t.customer_name LIKE CONCAT('%',#{nameOrPhone},'%') OR t.phone LIKE CONCAT('%',#{nameOrPhone},'%') )
+            <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>
         ORDER BY
-            t.create_date DESC
+          IFNULL( s.visite_date, t.create_date ) DESC
     </select>
 
     <select id="getAttributionList" resultType="com.huiju.welcome.model.TaCustomer">

src/main/resources/mapper/TaVisitorAppointmentMapper.xml

@@ -49,12 +49,14 @@
 
     <select id="getTodayAppointmentList" resultType="com.huiju.welcome.model.TaVisitorAppointment">
         SELECT
-            *
+            t.*,
+            s.username
         FROM
             ta_visitor_appointment t
+            LEFT JOIN sys_user s ON t.create_user = s.user_id
         WHERE
             t.STATUS > 0
-            AND ( DATE_FORMAT( visit_date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' ) OR visit_date IS NULL )
+            AND ( DATE_FORMAT( t.visit_date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' ) OR t.visit_date IS NULL )
         ORDER BY
             t.create_date DESC
     </select>