完善简道云逻辑和客户管理功能

web/src/main/java/com/example/web/mapper/UsersMapper.java

@@ -63,4 +63,7 @@ public interface UsersMapper {
     
     @DataSource("wechat")
     Users findByUserId(String userId);
+    
+    @DataSource("wechat")
+    int updateSyncStatusWithValue(Map<String, Object> params);
 }

web/src/main/java/com/example/web/service/impl/UserServiceImpl.java

@@ -2,8 +2,10 @@ package com.example.web.service.impl;
 
 import com.example.web.entity.InformationTra;
 import com.example.web.entity.Managers;
+import com.example.web.entity.Personnel;
 import com.example.web.entity.Users;
 import com.example.web.entity.UsersManagements;
+import com.example.web.mapper.PersonnelMapper;
 import com.example.web.mapper.UsersMapper;
 import com.example.web.mapper.ManagersMapper;
 import com.example.web.mapper.UsersManagementsMapper;
@@ -12,6 +14,7 @@ import com.example.web.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +28,9 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private ManagersMapper managersMapper;
     
+    @Autowired
+    private PersonnelMapper personnelMapper;
+    
     @Autowired
     private UsersManagementsMapper usersManagementsMapper;
     
@@ -177,6 +183,13 @@ public class UserServiceImpl implements UserService {
                 return result;
             }
             
+            // 检查客户是否是第一次跟进
+            Users user = usersMapper.findByUserId(userId);
+            if (user != null && user.getFollowup_at() != null) {
+                // 不是第一次跟进，设置followup_at参数为非空，避免更新跟进时间
+                params.put("followup_at", user.getFollowup_at());
+            }
+            
             // 更新跟进信息
             usersMapper.updateFollowup(params);
             
@@ -271,24 +284,97 @@ public class UserServiceImpl implements UserService {
                 return result;
             }
             
-            // 1. 更新 users 表，修改 type 字段并清空 followup 字段
+            // 获取客户信息
-            usersMapper.updateUserTypeAndClearFollowup(params);
+            Users user = usersMapper.findByUserId(userId);
+            if (user == null) {
+                result.put("success", false);
+                result.put("message", "客户不存在");
+                return result;
+            }
             
-            // 2. 清除 usermanagements 表中的记录
+            // 根据用户选择的类型进行不同的归还处理
-            usersMapper.clearUsersManagements(params);
+            // type参数是用户选择的类型，可能值包括：buyer(大贸易客户)、seller(供应商)、both(两者都是)、smalls(小品种客户)
+            if ("seller".equals(type) || "both".equals(type)) {
+                // 随机分配给指定的人员
+                String[] assignUsers = {"刘琴", "何佳芹", "汤敏", "李真音"};
+                int randomIndex = (int) (Math.random() * assignUsers.length);
+                String assignedUser = assignUsers[randomIndex];
+                
+                // 1. 更新 users 表，修改 type 字段
+                usersMapper.updateUserTypeAndClearFollowup(params);
+                
+                // 从primary数据源的personnel表查询业务员信息
+                Personnel personnel = personnelMapper.findByName(assignedUser);
+                
+                // 创建UsersManagements对象，将personnel表中的信息写入usermanagements表
+                UsersManagements usersManagements = new UsersManagements();
+                usersManagements.setUserId(userId);
+                usersManagements.setAssistant(assistant);
+                
+                if (personnel != null) {
+                    // 如果找到业务员信息，使用查询到的信息
+                    usersManagements.setManagerId(personnel.getManagerId());
+                    usersManagements.setManagercompany(personnel.getManagercompany());
+                    usersManagements.setManagerdepartment(personnel.getManagerdepartment());
+                    usersManagements.setOrganization(personnel.getOrganization());
+                    usersManagements.setRole(personnel.getProjectName()); // projectName对应role
+                    usersManagements.setUserName(personnel.getName()); // name对应userName
+                } else {
+                    // 如果未找到业务员信息，使用默认值
+                    usersManagements.setManagerId(userId);
+                    usersManagements.setManagercompany(managercompany);
+                    usersManagements.setManagerdepartment(managerdepartment);
+                    usersManagements.setOrganization(organization);
+                    usersManagements.setRole(role);
+                    usersManagements.setUserName(assignedUser);
+                }
                 
-            // 记录归还操作
+                // 更新或插入usermanagements表
-            InformationTra tra = createInformationTra(
+                UsersManagements existing = usersManagementsMapper.findByUserId(userId);
-                managercompany,
+                if (existing != null) {
-                managerdepartment,
+                    usersManagements.setId(existing.getId());
-                organization,
+                    usersManagements.setCreated_at(existing.getCreated_at());
-                role,
+                    usersManagements.setUpdated_at(LocalDateTime.now());
-                userName,
+                    usersManagementsMapper.update(usersManagements);
-                assistant,
+                } else {
-                userId,
+                    usersManagements.setCreated_at(LocalDateTime.now());
-                "归还客户到" + type
+                    usersManagements.setUpdated_at(LocalDateTime.now());
-            );
+                    usersManagementsMapper.insert(usersManagements);
-            informationTraService.recordUserOperation(tra);
+                }
+                
+                // 记录归还操作
+                InformationTra tra = createInformationTra(
+                    managercompany,
+                    managerdepartment,
+                    organization,
+                    role,
+                    userName,
+                    assistant,
+                    userId,
+                    "归还客户并分配给" + assignedUser
+                );
+                informationTraService.recordUserOperation(tra);
+            } else {
+                // 正常放入公海池
+                // 1. 更新 users 表，修改 type 字段
+                usersMapper.updateUserTypeAndClearFollowup(params);
+                
+                // 2. 清除 usermanagements 表中的记录
+                usersMapper.clearUsersManagements(params);
+                
+                // 记录归还操作
+                InformationTra tra = createInformationTra(
+                    managercompany,
+                    managerdepartment,
+                    organization,
+                    role,
+                    userName,
+                    assistant,
+                    userId,
+                    "归还客户到" + type
+                );
+                informationTraService.recordUserOperation(tra);
+            }
             
             result.put("success", true);
             result.put("message", "归还成功");
@@ -306,6 +392,7 @@ public class UserServiceImpl implements UserService {
         
         try {
             String userId = (String) params.get("userId");
+            String systemType = (String) params.get("systemType"); // 大贸易系统或小品种系统
             String userName = (String) params.get("userName");
             String managercompany = (String) params.get("managercompany");
             String managerdepartment = (String) params.get("managerdepartment");
@@ -313,14 +400,41 @@ public class UserServiceImpl implements UserService {
             String role = (String) params.get("role");
             String assistant = (String) params.get("assistant");
             
-            if (userId == null) {
+            if (userId == null || systemType == null) {
                 result.put("success", false);
                 result.put("message", "缺少必要参数");
                 return result;
             }
             
-            // 更新 users 表，设置 sync_statuss 字段值为 0
+            // 获取客户信息，判断客户类型
-            usersMapper.updateSyncStatusToZero(params);
+            Users user = usersMapper.findByUserId(userId);
+            if (user == null) {
+                result.put("success", false);
+                result.put("message", "客户不存在");
+                return result;
+            }
+            
+            String userType = user.getType();
+            Integer syncStatus = 0;
+            
+            // 根据系统类型和客户类型设置sync_statuss值
+            if ("大贸易系统".equals(systemType)) {
+                if ("seller".equals(userType) || "both".equals(userType)) {
+                    syncStatus = 1;
+                } else {
+                    syncStatus = 0;
+                }
+            } else if ("小品种系统".equals(systemType)) {
+                if ("seller".equals(userType) || "both".equals(userType)) {
+                    syncStatus = 3;
+                } else {
+                    syncStatus = 2;
+                }
+            }
+            
+            // 更新sync_statuss值
+            params.put("syncStatus", syncStatus);
+            usersMapper.updateSyncStatusWithValue(params);
             
             // 记录操作
             InformationTra tra = createInformationTra(
@@ -331,7 +445,7 @@ public class UserServiceImpl implements UserService {
                 userName,
                 assistant,
                 userId,
-                "简道云操作"
+                "简道云操作 - " + systemType
             );
             informationTraService.recordUserOperation(tra);
             

web/src/main/resources/mapper/UsersMapper.xml

@@ -206,7 +206,10 @@
     <update id="updateFollowup" parameterType="java.util.Map">
         UPDATE users
         SET followup = #{followup},
-            followup_at = NOW(),
+            updated_at = NOW(),
+            <if test="followup_at == null">
+                followup_at = NOW(),
+            </if>
             type = #{type},
             level = #{level},
             detailedaddress = #{detailedaddress},
@@ -240,6 +243,12 @@
         WHERE userId = #{userId}
     </update>
     
+    <update id="updateSyncStatusWithValue" parameterType="java.util.Map">
+        UPDATE users
+        SET sync_statuss = #{syncStatus}
+        WHERE userId = #{userId}
+    </update>
+    
     <update id="updateUserTypeAndClearFollowup" parameterType="java.util.Map">
         UPDATE users
         SET type = #{type},

web/src/main/resources/static/index.html

@@ -1043,7 +1043,7 @@
                     // 只有管理员显示复选框
                     var checkboxCell = isAdmin ? '<td><input type="checkbox" class="userCheckbox" data-userid="' + (user.userId || '') + '"></td>' : '<td style="width: 40px;"></td>';
                     
-                    var row = '<tr onclick="openDetailModal(\'' + (user.userId || '') + '\')" style="cursor: pointer;">' +
+                    var row = '<tr style="cursor: default;">' +
                         checkboxCell +
                         '<td>' + (user.nickName || '-') + '</td>' +
                         '<td>' + (user.phoneNumber || '-') + '</td>' +
@@ -1052,7 +1052,7 @@
                         '<td>' + (user.followup || '-') + '</td>' +
                         '<td>' + responseTime + '</td>' +
                         managerCell +
-                        '<td><button onclick="openFollowupModal(\'' + (user.userId || '') + '\', \'' + (user.nickName || '') + '\', \'' + (user.phoneNumber || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #1890ff; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">跟进</button> <button onclick="openReturnModal(\'' + (user.userId || '') + '\', \'' + (user.nickName || '') + '\', \'' + (user.phoneNumber || '') + '\', \'' + (user.type || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #faad14; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">归还</button> ' + jianDaoYunButton + '</td>' +
+                        '<td><button onclick="openFollowupModal(\'' + (user.userId || '') + '\', \'' + (user.nickName || '') + '\', \'' + (user.phoneNumber || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #1890ff; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">跟进</button> <button onclick="openDetailModal(\'' + (user.userId || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #13c2c2; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">详情</button> <button onclick="openReturnModal(\'' + (user.userId || '') + '\', \'' + (user.nickName || '') + '\', \'' + (user.phoneNumber || '') + '\', \'' + (user.type || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #faad14; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">归还</button> ' + jianDaoYunButton + '</td>' +
                         '</tr>';
                     personalBody.innerHTML += row;
                     
@@ -2231,7 +2231,15 @@
                     <h3 style="margin: 0 0 20px 0; font-size: 18px; font-weight: 600; color: #333; text-align: center;">简道云</h3>
                     <input type="hidden" id="jianDaoYunUserId">
                     <div style="margin-bottom: 24px; text-align: center;">
-                        <p style="font-size: 14px; color: #666;">是否将客户拉入你的简道云？</p>
+                        <p style="font-size: 14px; color: #666; margin-bottom: 16px;">选择要拉入的系统：</p>
+                        <div style="text-align: left; margin-left: 80px;">
+                            <label style="display: block; margin-bottom: 12px; font-size: 14px; color: #333;">
+                                <input type="radio" name="systemType" value="大贸易系统" checked style="margin-right: 8px;"> 大贸易系统
+                            </label>
+                            <label style="display: block; margin-bottom: 12px; font-size: 14px; color: #333;">
+                                <input type="radio" name="systemType" value="小品种系统" style="margin-right: 8px;"> 小品种系统
+                            </label>
+                        </div>
                     </div>
                     <div style="text-align: right; margin-top: 24px;">
                         <button onclick="closeJianDaoYunModal()" style="padding: 10px 16px; margin-right: 12px; border: 1px solid #d9d9d9; border-radius: 4px; font-size: 14px; color: #666; background-color: white; cursor: pointer; transition: all 0.3s ease;">取消</button>
@@ -2818,7 +2826,7 @@
                             managerCell = '<td style="display: none;"></td>';
                         }
                         
-                        var row = '<tr onclick="openDetailModal(\'' + (user.userId || '') + '\')" style="cursor: pointer;">' +
+                        var row = '<tr style="cursor: default;">' +
                             '<td><input type="checkbox" class="userCheckbox" data-userid="' + (user.userId || '') + '"></td>' +
                             '<td>' + (user.nickName || '-') + '</td>' +
                             '<td>' + (user.phoneNumber || '-') + '</td>' +
@@ -2827,7 +2835,7 @@
                             '<td>' + (user.followup || '-') + '</td>' +
                             '<td>' + responseTime + '</td>' +
                             managerCell +
-                            '<td><button onclick="claimCustomer(\'' + (user.userId || '') + '\', \'' + (user.nickName || '') + '\', \'' + (user.phoneNumber || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #52c41a; color: white; border: none; border-radius: 4px; font-size: 12px;">认领</button></td>' +
+                            '<td><button onclick="openDetailModal(\'' + (user.userId || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #13c2c2; color: white; border: none; border-radius: 4px; font-size: 12px; margin-right: 4px;">详情</button> <button onclick="claimCustomer(\'' + (user.userId || '') + '\', \'' + (user.nickName || '') + '\', \'' + (user.phoneNumber || '') + '\'); event.stopPropagation();" style="padding: 4px 8px; background-color: #52c41a; color: white; border: none; border-radius: 4px; font-size: 12px;">认领</button></td>' +
                             '</tr>';
                         publicBody.innerHTML += row;
                         
@@ -2847,36 +2855,39 @@
         }
         
         function claimCustomer(userId, userName, phone) {
-            var usersManagements = userInfo.usersManagements;
+            // 显示确认弹窗
-            
+            if (confirm('确认认领该客户吗？')) {
-            var params = {
+                var usersManagements = userInfo.usersManagements;
-                userId: userId,
+                
-                userName: usersManagements.userName || '',
+                var params = {
-                managercompany: usersManagements.managercompany || '',
+                    userId: userId,
-                managerdepartment: usersManagements.managerdepartment || '',
+                    userName: usersManagements.userName || '',
-                organization: usersManagements.organization || '',
+                    managercompany: usersManagements.managercompany || '',
-                role: usersManagements.role || ''
+                    managerdepartment: usersManagements.managerdepartment || '',
-            };
+                    organization: usersManagements.organization || '',
-            
+                    role: usersManagements.role || ''
-            var url = '/KH/api/users/claim';
+                };
                 
-            var xhr = new XMLHttpRequest();
+                var url = '/KH/api/users/claim';
-            xhr.open('POST', url, true);
+                
-            xhr.setRequestHeader('Content-Type', 'application/json');
+                var xhr = new XMLHttpRequest();
-            xhr.onreadystatechange = function() {
+                xhr.open('POST', url, true);
-                if (xhr.readyState == 4 && xhr.status == 200) {
+                xhr.setRequestHeader('Content-Type', 'application/json');
-                    var data = JSON.parse(xhr.responseText);
+                xhr.onreadystatechange = function() {
-                    if (data.success) {
+                    if (xhr.readyState == 4 && xhr.status == 200) {
-                        showAlert('认领成功');
+                        var data = JSON.parse(xhr.responseText);
-                        // 重新加载数据
+                        if (data.success) {
-                        loadPublicData();
+                            showAlert('认领成功');
-                        loadPersonalData();
+                            // 重新加载数据
-                    } else {
+                            loadPublicData();
-                        showAlert('认领失败: ' + data.message);
+                            loadPersonalData();
+                        } else {
+                            showAlert('认领失败: ' + data.message);
+                        }
                     }
-                }
+                };
-            };
+                xhr.send(JSON.stringify(params));
-            xhr.send(JSON.stringify(params));
+            }
         }
         
         function openFollowupModal(userId, userName, phone) {
@@ -3205,8 +3216,12 @@
             var userId = document.getElementById('jianDaoYunUserId').value;
             var usersManagements = userInfo.usersManagements;
             
+            // 获取选中的系统类型
+            var systemType = document.querySelector('input[name="systemType"]:checked').value;
+            
             var params = {
                 userId: userId,
+                systemType: systemType,
                 userName: usersManagements.userName || '',
                 managercompany: usersManagements.managercompany || '',
                 managerdepartment: usersManagements.managerdepartment || '',
@@ -3247,7 +3262,8 @@
                 managercompany: usersManagements.managercompany || '',
                 managerdepartment: usersManagements.managerdepartment || '',
                 organization: usersManagements.organization || '',
-                role: usersManagements.role || ''
+                role: usersManagements.role || '',
+                assistant: usersManagements.assistant || ''
             };
             
             var url = '/KH/api/users/return';