私域操盘手 - 流量池列表已转化的列表数据对接

Cunkebao/app/traffic-pool/page.tsx

@@ -95,6 +95,22 @@ interface Statistics {
   todayAddCount: number
 }
 
+interface ConvertedUser {
+  id: number
+  nickname: string
+  avatar: string
+  wechatId: string
+  fromd: string
+  tags: string[]
+  createTime: string
+  status: number
+}
+
+interface ConvertedResponse {
+  list: ConvertedUser[]
+  total: number
+}
+
 export default function TrafficPoolPage() {
   const router = useRouter()
   const searchParams = useSearchParams()
@@ -155,12 +171,10 @@ export default function TrafficPoolPage() {
         limit: "30"
       })
 
-      // 只有在有搜索关键词时才添加 keyword 参数
       if (debouncedSearchQuery) {
         params.append("keyword", debouncedSearchQuery)
       }
 
-      // 只有在选择了特定来源时才添加 fromd 参数
       if (sourceFilter !== "all") {
         const selectedSource = sourceTypes.find(source => source.id.toString() === sourceFilter)
         if (selectedSource) {
@@ -168,39 +182,51 @@ export default function TrafficPoolPage() {
         }
       }
 
-      // 只有在选择了特定状态时才添加 status 参数
       if (statusFilter !== "all") {
         params.append("status", statusFilter)
       }
 
-      const response = await api.get<ApiResponse<TrafficPoolResponse>>(`/v1/traffic/pool?${params.toString()}`, {
+      const endpoint = activeCategory === "customer" 
-        headers: {
+        ? '/v1/traffic/pool/converted' 
-          Authorization: `Bearer ${localStorage.getItem('token')}`
+        : '/v1/traffic/pool'
-        }
+
-      } as any)
+      const response = await api.get<ApiResponse<any>>(
+        `${endpoint}?${params.toString()}`,
+        {
+          headers: {
+            Authorization: `Bearer ${localStorage.getItem('token')}`
+          }
+        } as any
+      )
 
       if (response.code === 200) {
-        const { list, pagination } = response.data
+        const { list } = response.data
         
-        const transformedUsers = list.map(user => ({
+        const transformedUsers: TrafficUser[] = list.map((user: any) => ({
           id: user.id.toString(),
           avatar: user.avatar,
-          nickname: user.name || user.nickname || '未知用户',
+          nickname: user.nickname || user.name || '未知用户',
           wechatId: user.wechatId,
-          phone: user.phone,
+          phone: user.phone || '',
-          region: user.region,
+          region: user.region || '',
-          note: user.note,
+          note: user.note || '',
-          status: user.status,
+          status: activeCategory === "customer" ? 3 : user.status,
           addTime: formatDateTime(user.createTime),
           source: user.fromd || '未知来源',
-          assignedTo: user.assignedTo,
+          assignedTo: user.assignedTo || '',
-          category: user.category || "potential",
+          category: activeCategory as "potential" | "customer" | "lost",
-          tags: user.tags || []
+          tags: Array.isArray(user.tags) 
+            ? user.tags.map((tag: string) => ({
+                id: tag,
+                name: tag,
+                color: 'bg-blue-100 text-blue-800'
+              }))
+            : []
         }))
 
         setUsers(prev => isNewSearch ? transformedUsers : [...prev, ...transformedUsers])
         setCurrentPage(page)
-        setHasMore(list.length > 0 && page < pagination.totalPages)
+        setHasMore(list.length === 30)
       } else {
         toast({
           title: "获取数据失败",
@@ -222,7 +248,7 @@ export default function TrafficPoolPage() {
       setIsFetching(false)
       setLoading(false)
     }
-  }, [debouncedSearchQuery, sourceFilter, statusFilter, sourceTypes])
+  }, [debouncedSearchQuery, sourceFilter, statusFilter, sourceTypes, activeCategory])
 
   const fetchStatusTypes = useCallback(async () => {
     try {
@@ -456,25 +482,27 @@ export default function TrafficPoolPage() {
               </SelectContent>
             </Select>
 
-            <Select
+            {activeCategory === "potential" && (
-              value={statusFilter}
+              <Select
-              onValueChange={(value) => {
+                value={statusFilter}
-                setStatusFilter(value)
+                onValueChange={(value) => {
-                setCurrentPage(1)
+                  setStatusFilter(value)
-              }}
+                  setCurrentPage(1)
-            >
+                }}
-              <SelectTrigger className="w-[120px]">
+              >
-                <SelectValue placeholder="状态" />
+                <SelectTrigger className="w-[120px]">
-              </SelectTrigger>
+                  <SelectValue placeholder="状态" />
-              <SelectContent>
+                </SelectTrigger>
-                <SelectItem value="all">全部状态</SelectItem>
+                <SelectContent>
-                {statusTypes.map((status) => (
+                  <SelectItem value="all">全部状态</SelectItem>
-                  <SelectItem key={status.id} value={status.id.toString()}>
+                  {statusTypes.map((status) => (
-                    {status.name}
+                    <SelectItem key={status.id} value={status.id.toString()}>
-                  </SelectItem>
+                      {status.name}
-                ))}
+                    </SelectItem>
-              </SelectContent>
+                  ))}
-            </Select>
+                </SelectContent>
+              </Select>
+            )}
           </div>
 
           {/* 用户列表 */}
@@ -506,14 +534,22 @@ export default function TrafficPoolPage() {
                           <div className="font-medium truncate">{user.nickname}</div>
                           <div
                             className={`text-xs px-2 py-1 rounded-full ${
-                              user.status === 2
+                              activeCategory === "customer"
                                 ? "bg-green-100 text-green-800"
-                                : user.status === 1
+                                : user.status === 2
-                                  ? "bg-yellow-100 text-yellow-800"
+                                  ? "bg-green-100 text-green-800"
-                                  : "bg-red-100 text-red-800"
+                                  : user.status === 1
+                                    ? "bg-yellow-100 text-yellow-800"
+                                    : "bg-red-100 text-red-800"
                             }`}
                           >
-                            {user.status === 2 ? "已添加" : user.status === 1 ? "待处理" : "已失败"}
+                            {activeCategory === "customer" 
+                              ? "已通过" 
+                              : user.status === 2 
+                                ? "已添加" 
+                                : user.status === 1 
+                                  ? "待处理" 
+                                  : "已失败"}
                           </div>
                         </div>
                         <div className="text-sm text-gray-500">微信号: {user.wechatId}</div>
@@ -577,14 +613,22 @@ export default function TrafficPoolPage() {
                   <div className="text-sm text-gray-500">{selectedUser.wechatId}</div>
                   <Badge
                     className={`mt-1 ${
-                      selectedUser.status === 2
+                      activeCategory === "customer"
                         ? "bg-green-100 text-green-800"
-                        : selectedUser.status === 1
+                        : selectedUser.status === 2
-                          ? "bg-yellow-100 text-yellow-800"
+                          ? "bg-green-100 text-green-800"
-                          : "bg-red-100 text-red-800"
+                          : selectedUser.status === 1
+                            ? "bg-yellow-100 text-yellow-800"
+                            : "bg-red-100 text-red-800"
                     }`}
                   >
-                    {selectedUser.status === 2 ? "已添加" : selectedUser.status === 1 ? "待处理" : "已失败"}
+                    {activeCategory === "customer" 
+                      ? "已通过" 
+                      : selectedUser.status === 2 
+                        ? "已添加" 
+                        : selectedUser.status === 1 
+                          ? "待处理" 
+                          : "已失败"}
                   </Badge>
                 </div>
               </div>

Server/application/cunkebao/controller/traffic/GetConvertedListWithInCompanyV1Controller.php

@@ -13,6 +13,25 @@ use library\ResponseHelper;
  */
 class GetConvertedListWithInCompanyV1Controller extends BaseController
 {
+    /**
+     * 构建返回数据
+     *
+     * @param \think\Paginator $result
+     * @return array
+     */
+    protected function makeResultedSet(\think\Paginator $result): array
+    {
+        $resultSets = [];
+
+        foreach ($result->items() as $item) {
+            $item->tags = json_decode($item->tags);
+
+            array_push($resultSets, $item->toArray());
+        }
+
+        return $resultSets;
+    }
+
     /**
      * 构建查询条件
      *
@@ -47,7 +66,8 @@ class GetConvertedListWithInCompanyV1Controller extends BaseController
         $query = TrafficSourceModel::alias('s')
             ->field(
                 [
-                    'w.id', 'w.nickname', 'w.avatar', 'w.wechatId',
+                    'w.id', 'w.nickname', 'w.avatar',
+                    'CASE WHEN w.alias IS NULL OR w.alias = "" THEN w.wechatId ELSE w.alias END AS wechatId',
                     's.fromd',
                     'f.tags', 'f.createTime', TrafficSourceModel::STATUS_PASSED . ' status'
                 ]
@@ -81,7 +101,7 @@ class GetConvertedListWithInCompanyV1Controller extends BaseController
 
             return ResponseHelper::success(
                 [
-                    'list'  => $result->items(),
+                    'list'  => $this->makeResultedSet($result),
                     'total' => $result->total(),
                 ]
             );