修改公海池操作按钮和归还逻辑

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

@@ -305,12 +305,19 @@ public class UserServiceImpl implements UserService {
             }
             
             // 获取客户信息
-            Users user = usersMapper.findByUserId(userId);
+        Users user = usersMapper.findByUserId(userId);
-            if (user == null) {
+        if (user == null) {
-                result.put("success", false);
+            result.put("success", false);
-                result.put("message", "客户不存在");
+            result.put("message", "客户不存在");
-                return result;
+            return result;
-            }
+        }
+        
+        // 检查客户是否已经被跟进过
+        if (user.getFollowup_at() == null) {
+            result.put("success", false);
+            result.put("message", "客户未跟进，不允许归还到公海池");
+            return result;
+        }
             
             // 根据用户选择的类型进行不同的归还处理
             // type参数是用户选择的类型，可能值包括：buyer(大贸易客户)、seller(供应商)、both(两者都是)、smalls(小品种客户)

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

@@ -3146,7 +3146,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="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></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;