bug fix

.idea/workspace.xml

@@ -6,26 +6,15 @@
   <component name="ChangeListManager">
     <list default="true" id="5dd66384-19bf-43a0-b6b4-b05d9b7b9cd4" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCarRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCarRecord.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysParamService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysParamService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaVisitorAppointmentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaVisitorAppointmentService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/SysParamServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/SysParamServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFollowupRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFollowupRecordServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMessageRecordImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMessageRecordImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -74,20 +63,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="ITaPersonService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java">
+      <file leaf-file-name="TaCustomerController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="454">
-              <caret line="58" column="12" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TaPersonServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-500">
-              <caret line="358" column="19" selection-start-line="358" selection-start-column="19" selection-end-line="358" selection-end-column="19" />
+            <state relative-caret-position="113">
+              <caret line="232" column="57" lean-forward="true" selection-start-line="232" selection-start-column="57" selection-end-line="232" selection-end-column="57" />
             </state>
           </provider>
         </entry>
@@ -95,8 +75,8 @@
       <file leaf-file-name="ITaCustomerService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="235">
-              <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
+            <state relative-caret-position="798">
+              <caret line="43" column="14" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -104,68 +84,60 @@
       <file leaf-file-name="TaCustomerServiceImpl.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="193" selection-start-line="193" selection-end-line="193" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ITaMainUsherRecordService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="561">
-              <caret line="42" column="12" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
+            <state relative-caret-position="60">
+              <caret line="297" column="14" selection-start-line="297" selection-start-column="14" selection-end-line="297" selection-end-column="14" />
+              <folding>
+                <element signature="e#1809#1810#0" expanded="true" />
+                <element signature="e#1872#1873#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TaMainUsherRecordServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
+      <file leaf-file-name="ITaFollowupRecordService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="241" selection-start-line="241" selection-end-line="241" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="294">
+              <caret line="17" column="26" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="26" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AliFaceUtils.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java">
+      <file leaf-file-name="TaFollowupRecordServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFollowupRecordServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
-              <caret line="286" selection-start-line="286" selection-end-line="286" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="420">
+              <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CameraServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java">
+      <file leaf-file-name="ITaMainUsherRecordService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="487">
-              <caret line="164" column="40" selection-start-line="164" selection-start-column="40" selection-end-line="164" selection-end-column="40" />
+            <state relative-caret-position="252">
+              <caret line="20" column="23" lean-forward="true" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CameraController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
+      <file leaf-file-name="TaMainUsherRecordServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="258">
-              <caret line="128" lean-forward="true" selection-start-line="128" selection-end-line="128" />
+            <state relative-caret-position="-512">
+              <caret line="394" lean-forward="true" selection-start-line="394" selection-end-line="394" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TaMainUsherRecordController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java">
+      <file leaf-file-name="TaCustomer.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="93" selection-start-line="93" selection-end-line="93" />
+            <state relative-caret-position="291">
+              <caret line="67" column="41" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="41" />
             </state>
           </provider>
         </entry>
@@ -182,10 +154,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>web</find>
-      <find>/wx/login</find>
-      <find>/taCarRecord</find>
-      <find>/taCustomerMap</find>
       <find>/taCustomer</find>
       <find>isSales</find>
       <find>apointment</find>
@@ -212,6 +180,10 @@
       <find>newLogByDevice</find>
       <find>insertCustomer</find>
       <find>newCustByCarDevice</find>
+      <find>TaFollowupRecord</find>
+      <find>taWechatUserMapper</find>
+      <find>newRecordByCust</find>
+      <find>follows</find>
     </findStrings>
     <replaceStrings>
       <replace>com.huiju.welcome</replace>
@@ -234,14 +206,10 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMiniFormidsImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMessageRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/TaCustomerMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCustomerMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysUserService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/SysUserServiceImpl.java" />
@@ -253,7 +221,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/config/TencentProperties.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/TencentFaceUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/ImgController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ICameraService.java" />
@@ -265,11 +232,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaVisitorAppointmentService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysParamService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/SysParamServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMessageRecordImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarRecordController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java" />
@@ -279,12 +244,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFollowupRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -385,7 +357,22 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="service" type="b2602c69:ProjectViewProjectNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="service" type="b2602c69:ProjectViewProjectNode" />
@@ -555,10 +542,11 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="481978000" />
+    <option name="totallyTimeSpent" value="497747000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1015" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="10" />
       <window_info anchor="bottom" id="Event Log" order="18" side_tool="true" />
@@ -570,7 +558,7 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="0" weight="0.25" />
       <window_info id="UI Designer" order="4" />
-      <window_info active="true" anchor="bottom" id="Debug" order="0" visible="true" weight="0.49258837" />
+      <window_info active="true" anchor="bottom" id="Debug" order="0" visible="true" weight="0.37970352" />
       <window_info anchor="bottom" id="TODO" order="3" />
       <window_info anchor="bottom" id="Messages" order="12" weight="0.3295325" />
       <window_info anchor="right" id="Palette&#9;" order="4" />
@@ -580,7 +568,7 @@
       <window_info anchor="bottom" id="Version Control" order="11" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.3295325" />
       <window_info anchor="bottom" id="Spring" order="5" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.16191562" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.37058154" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
       <window_info anchor="right" id="Bean Validation" order="8" />
       <window_info id="Web" order="5" side_tool="true" />
@@ -632,15 +620,9 @@
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java</url>
-          <line>227</line>
-          <properties />
-          <option name="timeStamp" value="40" />
-        </line-breakpoint>
         <line-breakpoint type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java</url>
-          <line>193</line>
+          <line>196</line>
           <properties />
           <option name="timeStamp" value="41" />
         </line-breakpoint>
@@ -656,79 +638,26 @@
           <properties />
           <option name="timeStamp" value="50" />
         </line-breakpoint>
-        <line-breakpoint type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java</url>
-          <line>241</line>
-          <properties />
-          <option name="timeStamp" value="51" />
-        </line-breakpoint>
         <line-breakpoint type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java</url>
           <line>286</line>
           <properties />
           <option name="timeStamp" value="61" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java</url>
+          <line>202</line>
+          <properties />
+          <option name="timeStamp" value="62" />
+        </line-breakpoint>
       </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
       </breakpoints-dialog>
-      <option name="time" value="62" />
+      <option name="time" value="66" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://D:/REPO/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/web/filter/RequestContextFilter.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="41" selection-start-line="41" selection-end-line="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE.jar!/org/springframework/web/filter/OncePerRequestFilter.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="34" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/org/apache/tomcat/embed/tomcat-embed-core/9.0.17/tomcat-embed-core-9.0.17.jar!/org/apache/catalina/core/StandardContextValve.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="268">
-          <caret line="48" selection-start-line="48" selection-end-line="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/org/apache/tomcat/embed/tomcat-embed-core/9.0.17/tomcat-embed-core-9.0.17.jar!/org/apache/catalina/core/StandardWrapperValve.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="155" selection-start-line="155" selection-end-line="155" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/org/apache/tomcat/embed/tomcat-embed-core/9.0.17/tomcat-embed-core-9.0.17.jar!/org/apache/catalina/authenticator/AuthenticatorBase.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="317" selection-start-line="317" selection-end-line="317" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://D:/REPO/org/apache/tomcat/embed/tomcat-embed-core/9.0.17/tomcat-embed-core-9.0.17.jar!/org/apache/tomcat/util/http/parser/HttpParser.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="133" selection-start-line="133" selection-end-line="133" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="903">
-          <caret line="63" selection-start-line="63" selection-end-line="63" />
-          <folding>
-            <element signature="e#2779#2795#0" expanded="true" />
-            <element signature="e#2992#3013#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysParamService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="504">
@@ -884,13 +813,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="15" column="46" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaPerson.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-183">
@@ -918,141 +840,197 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitorAppointment.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="487">
-          <caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />
+        <state relative-caret-position="483">
+          <caret line="35" column="21" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="454">
+          <caret line="58" column="12" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-500">
+          <caret line="358" column="19" selection-start-line="358" selection-start-column="19" selection-end-line="358" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="327">
+          <caret line="117" lean-forward="true" selection-start-line="117" selection-end-line="117" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="444">
+          <caret line="314" lean-forward="true" selection-start-line="314" selection-end-line="314" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="116" column="14" lean-forward="true" selection-start-line="116" selection-start-column="14" selection-end-line="116" selection-end-column="14" />
+        <state relative-caret-position="336">
+          <caret line="16" column="54" selection-start-line="16" selection-start-column="49" selection-end-line="16" selection-end-column="54" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="676">
-          <caret line="38" column="5" lean-forward="true" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
+        <state relative-caret-position="328">
+          <caret line="62" column="48" lean-forward="true" selection-start-line="62" selection-start-column="48" selection-end-line="62" selection-end-column="48" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="247" column="63" lean-forward="true" selection-start-line="247" selection-start-column="63" selection-end-line="247" selection-end-column="63" />
+        <state relative-caret-position="241">
+          <caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomer.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        <state relative-caret-position="183">
+          <caret line="124" column="13" lean-forward="true" selection-start-line="124" selection-start-column="13" selection-end-line="124" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitorAppointment.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="35" column="21" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="21" />
+        <state relative-caret-position="367">
+          <caret line="151" column="33" lean-forward="true" selection-start-line="151" selection-start-column="33" selection-end-line="151" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ICameraService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
+        <state relative-caret-position="404">
+          <caret line="164" column="37" selection-start-line="164" selection-start-column="37" selection-end-line="164" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ICameraService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="454">
-          <caret line="58" column="12" selection-start-line="58" selection-start-column="12" selection-end-line="58" selection-end-column="12" />
+        <state relative-caret-position="147">
+          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/DateUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-500">
-          <caret line="358" column="19" selection-start-line="358" selection-start-column="19" selection-end-line="358" selection-end-column="19" />
+        <state relative-caret-position="311">
+          <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="487">
-          <caret line="164" column="40" selection-start-line="164" selection-start-column="40" selection-end-line="164" selection-end-column="40" />
+        <state relative-caret-position="330">
+          <caret line="94" column="29" lean-forward="true" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="235">
-          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
+        <state relative-caret-position="173">
+          <caret line="22" column="23" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="561">
-          <caret line="42" column="12" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
+          <caret line="79" lean-forward="true" selection-start-line="79" selection-end-line="79" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="117" lean-forward="true" selection-start-line="117" selection-end-line="117" />
+        <state relative-caret-position="113">
+          <caret line="232" column="57" lean-forward="true" selection-start-line="232" selection-start-column="57" selection-end-line="232" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="128" lean-forward="true" selection-start-line="128" selection-end-line="128" />
+        <state relative-caret-position="798">
+          <caret line="43" column="14" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="93" selection-start-line="93" selection-end-line="93" />
+        <state relative-caret-position="252">
+          <caret line="20" column="23" lean-forward="true" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="241" selection-start-line="241" selection-end-line="241" />
+        <state relative-caret-position="-512">
+          <caret line="394" lean-forward="true" selection-start-line="394" selection-end-line="394" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFollowupRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="193" selection-start-line="193" selection-end-line="193" />
+        <state relative-caret-position="294">
+          <caret line="17" column="26" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFollowupRecord.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="320">
+          <caret line="28" column="25" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFollowupRecordServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="286" selection-start-line="286" selection-end-line="286" />
+        <state relative-caret-position="420">
+          <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="297" column="14" selection-start-line="297" selection-start-column="14" selection-end-line="297" selection-end-column="14" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#1809#1810#0" expanded="true" />
+            <element signature="e#1872#1873#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCustomer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="291">
+          <caret line="67" column="41" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -7,10 +7,7 @@ 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.TaCustomerMap;
-import com.huiju.welcome.model.TaPerson;
-import com.huiju.welcome.model.TaWechatUser;
+import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.*;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.JWTUtils;
@@ -57,13 +54,16 @@ public class TaCustomerController extends BaseController {
     @Autowired
     ITaCustomerMapService iTaCustomerMapService;
 
+    @Autowired
+    ISysUserService iSysUserService;
+
     /**
      * 保存对象
      * @param taCustomer 实体对象
      * @return
      */
     @RequestMapping(value="/miniapp/customer",method= RequestMethod.POST)
-    public ResponseBean save(@RequestBody String paramStr){
+    public ResponseBean save(@RequestBody String paramStr, HttpServletRequest request){
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("保存内容格式非法或者为空", HttpStatus.SC_BAD_REQUEST);
@@ -72,6 +72,11 @@ public class TaCustomerController extends BaseController {
         TaCustomer taCustomer = JSONObject.parseObject(paramStr, TaCustomer.class);
         JSONArray follows = params.getJSONArray("follows");
 
+        String userId = JWTUtils.getSubject(request);
+        SysUser user = iSysUserService.getById(iTaWechatUserService.getById(userId).getPersonId());
+        taCustomer.setConsultantId(user.getUserId());
+        taCustomer.setRealtyConsultant(user.getUsername());
+
         ResponseBean responseBean = new ResponseBean();
         try {
             // 会员保存之前, 先保存人员
@@ -107,13 +112,13 @@ public class TaCustomerController extends BaseController {
             }
             iTaCustomerMapService.saveBatch(customerMapList);
 
+            // 新增会员来访信息
+            iTaMainUsherRecordService.newRecordByConsultant(taCustomer, follows);
+
             taCustomer.setStatus(StatusUtils.Normal);
             taCustomer.setCreateDate(LocalDateTime.now());
+            taCustomer.setRemark(null);
             if (iTaCustomerService.save(taCustomer)){
-
-                // 新增会员来访信息
-                iTaMainUsherRecordService.newRecordByConsultant(taCustomer);
-
                 List<TaPerson> group = iTaCustomerService.getGroup(taCustomer.getCustomerId());
                 taCustomer.setGroup(group);
                 responseBean.addSuccess(taCustomer);
@@ -154,7 +159,7 @@ public class TaCustomerController extends BaseController {
      * @return
      */
     @RequestMapping(value="/miniapp/customer/{id}",method= RequestMethod.PUT)
-    public ResponseBean update(@RequestBody String paramStr, @PathVariable Integer id){
+    public ResponseBean update(@RequestBody String paramStr, @PathVariable Integer id, HttpServletRequest request){
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("保存内容格式非法或者为空", HttpStatus.SC_BAD_REQUEST);
@@ -184,17 +189,20 @@ public class TaCustomerController extends BaseController {
                 iTaCustomerMapService.saveBatch(customerMapList);
             }
 
-            String remark = taCustomer.getRemark();
-            TaCustomer origin = iTaCustomerService.getById(id);
-            String originRemark = origin.getRemark();
-            if (null != remark && !"".equals(remark.trim())) {
-                originRemark = (null == originRemark || "".equals(originRemark)) ? "" : originRemark + "\n\n";
-                remark = originRemark + "---" + DateUtils.cutSecond(LocalDateTime.now())+ "---" + "\n" + remark;
-                taCustomer.setRemark(remark);
-            } else {
-                taCustomer.setRemark(originRemark);
-            }
+//            String remark = taCustomer.getRemark();
+//            TaCustomer origin = iTaCustomerService.getById(id);
+//            String originRemark = origin.getRemark();
+//            if (null != remark && !"".equals(remark.trim())) {
+//                originRemark = (null == originRemark || "".equals(originRemark)) ? "" : originRemark + "\n\n";
+//                remark = originRemark + "---" + DateUtils.cutSecond(LocalDateTime.now())+ "---" + "\n" + remark;
+//                taCustomer.setRemark(remark);
+//            } else {
+//                taCustomer.setRemark(originRemark);
+//            }
 
+            iTaMainUsherRecordService.updateByCustomer(taCustomer, follows, JWTUtils.getSubject(request));
+
+            taCustomer.setRemark(null);
             if (iTaCustomerService.updateById(taCustomer)){
 
                 // 反更新人员
@@ -222,7 +230,7 @@ public class TaCustomerController extends BaseController {
     public ResponseBean get(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            TaCustomer cust = iTaCustomerService.getById(id);
+            TaCustomer cust = iTaCustomerService.getWithLastVisit(id);
             if (cust == null) {
                 responseBean.addError("未找到客户信息");
                 return responseBean;
@@ -248,6 +256,7 @@ public class TaCustomerController extends BaseController {
         return ResponseBean.success(iTaCustomerService.getHistoryRecBy(filters));
     }
 
+
     /**
      * 分页查询
      */

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

@@ -69,6 +69,8 @@ public class TaMainUsherRecord implements Serializable {
 
     private String purpose;
 
+    private String remark;
+
     @TableField(exist = false)
     private List<TaFollowupRecord> follows;
 

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

@@ -38,4 +38,8 @@ public interface ITaCustomerService extends IService<TaCustomer> {
     TaCustomer getSameByPerson(Integer personId);
 
     boolean updataByCarRecord(TaCustomer taCustomer, TaCarRecord taCarRecord);
+
+    TaCustomer getByPhoneOrPlate(String phone, String plateNumber);
+
+    TaCustomer getWithLastVisit(Integer id);
 }

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

@@ -3,6 +3,8 @@ package com.huiju.welcome.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.model.TaFollowupRecord;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,5 @@ import com.huiju.welcome.model.TaFollowupRecord;
  */
 public interface ITaFollowupRecordService extends IService<TaFollowupRecord> {
 
+    List<TaFollowupRecord> getByMainRecord(Integer recId);
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.welcome.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.common.base.ResponseBean;
@@ -25,7 +26,7 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
 
     boolean newRecordByDeviceDeprecated(TaCustomer taCustomer, TaPerson taPerson);
 
-    boolean newRecordByConsultant(TaCustomer taCustomer);
+    boolean newRecordByConsultant(TaCustomer taCustomer, JSONArray follows);
     IPage<TaMainUsherRecord> taMainUsherRecordList(IPage<TaMainUsherRecord> pg,String phone,String platNumber,String personName,Integer appointment);
 
     /**
@@ -41,4 +42,8 @@ public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
     boolean deleteRecord(Integer id);
 
     boolean newRecordByDevice(TaPerson taPerson, TaCustomer taCustomer);
+
+    boolean updateByCustomer(TaCustomer taCustomer, JSONArray follows, String userId);
+
+    TaMainUsherRecord getTodayRecord(Integer customerId);
 }

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

@@ -119,7 +119,8 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
                     taCarRecord.setCustomerName(appointments.get(0).getPersonName());
                     taCarRecord.setPersonNum(appointments.get(0).getPersonNum());
                 } else {
-                    taCustomer = iTaCustomerService.newCustByCarDevice(taCarRecord);
+                    // 只有有预约才新建客户
+//                    taCustomer = iTaCustomerService.newCustByCarDevice(taCarRecord);
                 }
             }
         } else {
@@ -136,7 +137,7 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
         iTaFirstUsherRecordService.notifyMiniapp(taFirstUsherRecord);
 
         // 如果客户有固定置业, 推送消息给置业
-        if (null != taCustomer.getConsultantId()) {
+        if (null != taCustomer && null != taCustomer.getConsultantId()) {
             try {
                 iTaCustomerService.notifyConsultant(taCustomer);
             } catch (Exception e) {

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

@@ -52,6 +52,9 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     @Autowired
     ITaVisitorAppointmentService iTaVisitorAppointmentService;
 
+    @Autowired
+    ITaFollowupRecordService iTaFollowupRecordService;
+
     @Autowired
     TaWechatUserMapper taWechatUserMapper;
 
@@ -249,6 +252,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
             result.put("consultantId", custs.get(0).getConsultantId());
             result.put("consultantName", custs.get(0).getRealtyConsultant());
             result.put("purpose", custs.get(0).getPurpose());
+            result.put("sex", custs.get(0).getSex());
             result.put("plateNumber", custs.get(0).getPlateNumber());
         }
 
@@ -277,6 +281,38 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
         return true;
     }
 
+    @Override
+    public TaCustomer getByPhoneOrPlate(String phone, String plateNumber) {
+        QueryWrapper<TaCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(phone != null,"phone", phone).or().eq(plateNumber != null, "plate_number", plateNumber);
+        queryWrapper.eq(null == phone || null == plateNumber, "customer_id", -1); // 故意设置一个查询不到数据的条件
+        queryWrapper.orderByDesc("status");
+        queryWrapper.orderByDesc("create_date");
+        queryWrapper.last("limit 1");
+
+        return taCustomerMapper.selectOne(queryWrapper);
+    }
+
+    @Override
+    public TaCustomer getWithLastVisit(Integer id) {
+        TaCustomer taCustomer = taCustomerMapper.selectById(id);
+        if (null == taCustomer) return null;
+
+        TaMainUsherRecord taMainUsherRecord = iTaMainUsherRecordService.getTodayRecord(taCustomer.getCustomerId());
+        if (null != taMainUsherRecord) {
+            List<TaFollowupRecord> follows = iTaFollowupRecordService.getByMainRecord(taMainUsherRecord.getRecId());
+
+            if (null != follows && follows.size() > 0) {
+                Map<String, Object> lastVisit = new HashMap<String, Object>(){{
+                    put("follows", follows);
+                }};
+                taCustomer.setLastVisit(lastVisit);
+            }
+        }
+
+        return taCustomer;
+    }
+
     private TaCustomer newCustomerByPerson(TaPerson taPerson) throws Exception {
         TaCustomer taCustomer = new TaCustomer();
         taCustomer.setCustomerId(taPerson.getRealId());

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

@@ -1,6 +1,7 @@
 package com.huiju.welcome.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaFollowupRecordMapper;
 import com.huiju.welcome.model.TaFollowupRecord;
@@ -8,6 +9,8 @@ import com.huiju.welcome.service.ITaFollowupRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -20,4 +23,12 @@ import org.springframework.stereotype.Service;
 public class TaFollowupRecordServiceImpl extends ServiceImpl<TaFollowupRecordMapper, TaFollowupRecord> implements ITaFollowupRecordService {
     @Autowired
     TaFollowupRecordMapper taFollowupRecordMapper;
+
+    @Override
+    public List<TaFollowupRecord> getByMainRecord(Integer recId) {
+        QueryWrapper<TaFollowupRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("rec_id", recId);
+
+        return taFollowupRecordMapper.selectList(queryWrapper);
+    }
 }

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

@@ -1,29 +1,26 @@
 package com.huiju.welcome.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+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.Action;
 import com.huiju.welcome.common.WebSocketServer;
-import com.huiju.welcome.mapper.SysUserMapper;
-import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
-import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
-import com.huiju.welcome.mapper.TaWechatUserMapper;
+import com.huiju.welcome.mapper.*;
 import com.huiju.welcome.model.*;
 import com.huiju.welcome.common.base.ResponseBean;
-import com.huiju.welcome.mapper.TaCustomerMapper;
 import com.huiju.welcome.model.TaCustomer;
 import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.service.ITaCustomerService;
 import com.huiju.welcome.service.ITaMainUsherRecordService;
 import com.huiju.welcome.service.ITaPersonService;
-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.service.ITaWechatUserService;
+import com.huiju.welcome.utils.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,6 +36,7 @@ import java.util.List;
  * @author jobob
  * @since 2019-06-04
  */
+@Slf4j
 @Service
 public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordMapper, TaMainUsherRecord> implements ITaMainUsherRecordService {
     @Autowired
@@ -50,6 +48,9 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     @Autowired
     TaVisitorAppointmentMapper taVisitorAppointmentMapper;
 
+    @Autowired
+    TaFollowupRecordMapper taFollowupRecordMapper;
+
     @Autowired
     TaWechatUserMapper taWechatUserMapper;
 
@@ -84,7 +85,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
     @Override
     public boolean newRecordByDeviceDeprecated(TaCustomer taCustomer, TaPerson taPerson) {
-        TaMainUsherRecord taMainUsherRecord = newRecordByCust(taCustomer);
+        TaMainUsherRecord taMainUsherRecord = newRecordByCust(taCustomer, null);
         taMainUsherRecord.setStatus(StatusUtils.Ready);
         taMainUsherRecord.setPersonId(taPerson.getRealId());
         int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
@@ -105,25 +106,51 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     }
 
     @Override
-    public boolean newRecordByConsultant(TaCustomer taCustomer) {
-        TaMainUsherRecord taMainUsherRecord = newRecordByCust(taCustomer);
+    public boolean newRecordByConsultant(TaCustomer taCustomer, JSONArray follows) {
+        TaMainUsherRecord taMainUsherRecord = newRecordByCust(taCustomer, null);
+        taMainUsherRecord.setCustomerId(taCustomer.getCustomerId());
         int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
 
+        insertFollows(follows, taMainUsherRecord);
+
         return row > 0;
     }
 
-    private TaMainUsherRecord newRecordByCust(TaCustomer taCustomer) {
+    private boolean insertFollows(JSONArray follows, TaMainUsherRecord taMainUsherRecord) {
+        if (null != follows && follows.size() > 0) {
+            for (int i = 0; i < follows.size(); i ++) {
+                TaFollowupRecord rec = new TaFollowupRecord();
+                rec.setRecId(taMainUsherRecord.getRecId());
+                rec.setPersonId(follows.getJSONObject(i).getInteger("personId"));
+                rec.setAvatar(follows.getJSONObject(i).getString("avatar"));
+                taFollowupRecordMapper.insert(rec);
+            }
+        }
+
+        return true;
+    }
+
+    private TaMainUsherRecord newRecordByCust(TaCustomer taCustomer, SysUser user) {
         TaMainUsherRecord taMainUsherRecord = new TaMainUsherRecord();
         taMainUsherRecord.setCustomerId(taCustomer.getCustomerId());
+        taMainUsherRecord.setPersonId(taCustomer.getCustomerId());
         taMainUsherRecord.setPersonName(taCustomer.getCustomerName());
         taMainUsherRecord.setAvatar(taCustomer.getAvatar());
         taMainUsherRecord.setPhone(taCustomer.getPhone());
         taMainUsherRecord.setAppointment(taCustomer.getApointment());
-        taMainUsherRecord.setConsultantId(taCustomer.getConsultantId());
         taMainUsherRecord.setChannel(taCustomer.getChannel());
         taMainUsherRecord.setPurpose(taCustomer.getPurpose());
         taMainUsherRecord.setPlateNumber(taCustomer.getPlateNumber());
         taMainUsherRecord.setVisiteDate(LocalDateTime.now());
+        taMainUsherRecord.setRemark(taCustomer.getRemark());
+
+        if (null != user) {
+            taMainUsherRecord.setConsultantId(user.getUserId());
+            taMainUsherRecord.setRealtyConsultant(user.getUsername());
+        } else {
+            taMainUsherRecord.setConsultantId(taCustomer.getConsultantId());
+            taMainUsherRecord.setRealtyConsultant(taCustomer.getRealtyConsultant());
+        }
 
         if (StringUtils.isEmpty(taCustomer.getPhone())) {
             taMainUsherRecord.setStatus(StatusUtils.Ready);
@@ -238,15 +265,23 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
 
         // 是否更新了置业
         TaCustomer taCustomer = null;
-        if (null == taMainUsherRecord.getCustomerId()) {
-            taCustomer = iTaCustomerService.newCustByMainUsher(taMainUsherRecord);
-        } else {
-            taCustomer = iTaCustomerService.getById(taMainUsherRecord.getCustomerId());
+        // 尝试使用手机号去查找
+        if (null != taMainUsherRecord.getPhone() || null != taMainUsherRecord.getPlateNumber()) {
+            taCustomer = iTaCustomerService.getByPhoneOrPlate(taMainUsherRecord.getPhone(), taMainUsherRecord.getPlateNumber());
+        }
+
+        if (null == taCustomer) {
+            if (null == taMainUsherRecord.getCustomerId()) {
+                taCustomer = iTaCustomerService.newCustByMainUsher(taMainUsherRecord);
+            } else {
+                taCustomer = iTaCustomerService.getById(taMainUsherRecord.getCustomerId());
+            }
         }
 
         Integer originConsultant = taCustomer.getConsultantId();
 
         // 是否需要更新客户信息
+        // 只更新空内容
         if (StringUtils.isEmpty(taCustomer.getCustomerName()) || StringUtils.isEmpty(taCustomer.getPhone())) {
             if (StringUtils.isEmpty(taCustomer.getCustomerName())) {
                 taCustomer.setCustomerName(taMainUsherRecord.getPersonName());
@@ -256,6 +291,22 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
                 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);
         }
 
@@ -321,7 +372,7 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
     public boolean newRecordByDevice(TaPerson taPerson, TaCustomer taCustomer) {
         TaMainUsherRecord taMainUsherRecord = null;
         if (null != taCustomer) {
-            taMainUsherRecord = newRecordByCust(taCustomer);
+            taMainUsherRecord = newRecordByCust(taCustomer, null);
         } else {
             taMainUsherRecord = newRecordByPerson(taPerson);
         }
@@ -338,6 +389,55 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         return row > 0;
     }
 
+    @Override
+    public boolean updateByCustomer(TaCustomer taCustomer, JSONArray follows, String userId) {
+        TaMainUsherRecord taMainUsherRecord = getTodayRecord(taCustomer.getCustomerId());
+
+        if (null == taMainUsherRecord) {
+            Integer personId = taWechatUserMapper.selectById(userId).getPersonId();
+            taMainUsherRecord = newRecordByCust(taCustomer, sysUserMapper.selectById(personId));
+
+            int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
+            if (row < 1) {
+                log.error("新增跟进记录失败");
+                return false;
+            }
+        } else {
+            String remark = taMainUsherRecord.getRemark();
+
+            if (null == remark) {
+                remark = taCustomer.getRemark();
+            } else {
+                remark += "\n\n---" + DateUtils.cutSecond(LocalDateTime.now())+ "---" + "\n" + taCustomer.getRemark();
+            }
+            taMainUsherRecord.setRemark(remark);
+
+            int row = taMainUsherRecordMapper.updateById(taMainUsherRecord);
+            if (row < 1) {
+                log.error("更新跟进记录失败");
+                return false;
+            }
+        }
+
+        insertFollows(follows, taMainUsherRecord);
+
+        return true;
+    }
+
+    @Override
+    public TaMainUsherRecord getTodayRecord(Integer customerId) {
+        LocalDateTime now = LocalDateTime.now();
+        String today = DateUtils.localDatetime2day(now);
+
+        QueryWrapper<TaMainUsherRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("visite_date", today);
+        queryWrapper.eq("customer_id", customerId);
+        queryWrapper.orderByDesc("visite_date");
+        queryWrapper.last("limit 1");
+
+        return taMainUsherRecordMapper.selectOne(queryWrapper);
+    }
+
     private TaMainUsherRecord newRecordByPerson(TaPerson taPerson) {
         TaMainUsherRecord taMainUsherRecord = new TaMainUsherRecord();
         taMainUsherRecord.setPersonName(taPerson.getName());