diff --git a/Cunkebao/src/pages/mobile/mine/content/form/index.tsx b/Cunkebao/src/pages/mobile/mine/content/form/index.tsx
index 2aed0816..b0b5d4c9 100644
--- a/Cunkebao/src/pages/mobile/mine/content/form/index.tsx
+++ b/Cunkebao/src/pages/mobile/mine/content/form/index.tsx
@@ -38,7 +38,7 @@ export default function ContentForm() {
     GroupSelectionItem[]
   >([]);
   const [useAI, setUseAI] = useState(false);
-  const [aiPrompt, setAIPrompt] = useState("");
+  const [aiPrompt, setAIPrompt] = useState("重写这条朋友圈 要求：  1、原本的字数和意思不要修改超过10%  2、出现品牌名或个人名字就去除");
   const [enabled, setEnabled] = useState(true);
   const [dateRange, setDateRange] = useState<[Date | null, Date | null]>([
     null,
@@ -296,12 +296,13 @@ export default function ContentForm() {
           {useAI && (
             <div className={style["form-section"]}>
               <label className={style["form-label"]}>AI提示词</label>
-              <AntdInput
-                placeholder="请输入AI提示词"
-                value={aiPrompt}
-                onChange={e => setAIPrompt(e.target.value)}
-                className={style["input"]}
-              />
+              <TextArea
+                  placeholder="请输入AI提示词"
+                  value={aiPrompt}
+                  onChange={e => setAIPrompt(e.target.value)}
+                  className={style["input"]}
+                  autoSize={{ minRows: 4, maxRows: 10 }}
+                />
             </div>
           )}
 
diff --git a/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/api.ts b/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/api.ts
index d98ec6d2..557ae0c9 100644
--- a/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/api.ts
+++ b/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/api.ts
@@ -27,3 +27,12 @@ export function getWechatFriends(params: {
 export function getWechatFriendDetail(id: string) {
   return request("/v1/WechatFriend/detail", { id }, "GET");
 }
+
+// 好友转移接口
+export function transferWechatFriends(params: {
+  wechatId: string;
+  devices: number[];
+  inherit: boolean;
+}) {
+  return request("/v1/wechats/transfer-friends", params, "POST");
+}
diff --git a/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/detail.module.scss b/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/detail.module.scss
index c77c7dd4..c6309f70 100644
--- a/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/detail.module.scss
+++ b/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/detail.module.scss
@@ -582,6 +582,36 @@
     line-height: 1.5;
   }
 
+  .transfer-form {
+    margin-top: 20px;
+
+    .form-item {
+      margin-bottom: 16px;
+
+      .form-label {
+        font-size: 14px;
+        font-weight: 500;
+        color: #333;
+        margin-bottom: 8px;
+      }
+
+      .form-control {
+        width: 100%;
+      }
+
+      .form-control-switch {
+        display: flex;
+        align-items: center;
+
+        .switch-label {
+          margin-left: 8px;
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+  }
+
   .popup-actions {
     display: flex;
     flex-direction: column;
diff --git a/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/index.tsx b/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/index.tsx
index 12eb5e0f..3be617b5 100644
--- a/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/index.tsx
+++ b/Cunkebao/src/pages/mobile/mine/wechat-accounts/detail/index.tsx
@@ -10,6 +10,7 @@ import {
   Toast,
   Avatar,
   Tag,
+  Switch,
 } from "antd-mobile";
 import { Input, Pagination } from "antd";
 import NavCommon from "@/components/NavCommon";
@@ -20,7 +21,9 @@ import {
 } from "@ant-design/icons";
 import Layout from "@/components/Layout/Layout";
 import style from "./detail.module.scss";
-import { getWechatAccountDetail, getWechatFriends } from "./api";
+import { getWechatAccountDetail, getWechatFriends, transferWechatFriends } from "./api";
+import DeviceSelection from "@/components/DeviceSelection";
+import { DeviceSelectionItem } from "@/components/DeviceSelection/data";
 
 import { WechatAccountSummary, Friend } from "./data";
 
@@ -33,6 +36,9 @@ const WechatAccountDetail: React.FC = () => {
   const [accountInfo, setAccountInfo] = useState<any>(null);
   const [showRestrictions, setShowRestrictions] = useState(false);
   const [showTransferConfirm, setShowTransferConfirm] = useState(false);
+  const [selectedDevices, setSelectedDevices] = useState<DeviceSelectionItem[]>([]);
+  const [inheritInfo, setInheritInfo] = useState(true);
+  const [transferLoading, setTransferLoading] = useState(false);
   const [searchQuery, setSearchQuery] = useState("");
   const [activeTab, setActiveTab] = useState("overview");
   const [loadingInfo, setLoadingInfo] = useState(true);
@@ -181,16 +187,54 @@ const WechatAccountDetail: React.FC = () => {
   };
 
   const handleTransferFriends = () => {
+    setSelectedDevices([]);
+    setInheritInfo(true);
     setShowTransferConfirm(true);
   };
 
-  const confirmTransferFriends = () => {
-    Toast.show({
-      content: "好友转移计划已创建，请在场景获客中查看详情",
-      position: "top",
-    });
-    setShowTransferConfirm(false);
-    navigate("/scenarios");
+  const confirmTransferFriends = async () => {
+    if (!id) {
+      Toast.show({
+        content: "微信账号ID不存在",
+        position: "top",
+      });
+      return;
+    }
+
+    if (selectedDevices.length === 0) {
+      Toast.show({
+        content: "请选择至少一个目标设备",
+        position: "top",
+      });
+      return;
+    }
+
+    try {
+      setTransferLoading(true);
+
+      // 调用好友转移API
+      await transferWechatFriends({
+        wechatId: id,
+        devices: selectedDevices.map(device => device.id),
+        inherit: inheritInfo
+      });
+
+      Toast.show({
+        content: "好友转移计划已创建，请在场景获客中查看详情",
+        position: "top",
+      });
+      setShowTransferConfirm(false);
+      setSelectedDevices([]);
+      navigate("/scenarios");
+    } catch (error) {
+      console.error("好友转移失败:", error);
+      Toast.show({
+        content: "好友转移失败，请重试",
+        position: "top",
+      });
+    } finally {
+      setTransferLoading(false);
+    }
   };
 
   const getRestrictionLevelColor = (level: number) => {
@@ -545,15 +589,54 @@ const WechatAccountDetail: React.FC = () => {
           <p className={style["popup-description"]}>
             确定要将该微信号的好友转移到其他账号吗？此操作将创建一个好友转移计划。
           </p>
+
+          <div className={style["transfer-form"]}>
+            {/* 设备选择 */}
+            <div className={style["form-item"]}>
+              <div className={style["form-label"]}>迁移的新设备</div>
+              <div className={style["form-control"]}>
+                <DeviceSelection
+                  selectedOptions={selectedDevices}
+                  onSelect={setSelectedDevices}
+                  placeholder="请选择目标设备"
+                  showSelectedList={true}
+                />
+              </div>
+            </div>
+
+            {/* 同步原有信息 */}
+            <div className={style["form-item"]}>
+              <div className={style["form-label"]}>同步原有信息</div>
+              <div className={style["form-control-switch"]}>
+                <Switch
+                  checked={inheritInfo}
+                  onChange={setInheritInfo}
+                />
+                <span className={style["switch-label"]}>
+                  {inheritInfo ? "是" : "否"}
+                </span>
+              </div>
+            </div>
+          </div>
+
           <div className={style["popup-actions"]}>
-            <Button block color="primary" onClick={confirmTransferFriends}>
-              确认转移
+            <Button
+              block
+              color="primary"
+              onClick={confirmTransferFriends}
+              loading={transferLoading}
+              disabled={transferLoading}
+            >
+              {transferLoading ? "转移中..." : "确认转移"}
             </Button>
             <Button
               block
               color="danger"
               fill="outline"
-              onClick={() => setShowTransferConfirm(false)}
+              onClick={() => {
+                setShowTransferConfirm(false);
+                setSelectedDevices([]);
+              }}
             >
               取消
             </Button>
diff --git a/Server/application/api/controller/AccountController.php b/Server/application/api/controller/AccountController.php
index f239be00..ce27ce54 100644
--- a/Server/application/api/controller/AccountController.php
+++ b/Server/application/api/controller/AccountController.php
@@ -162,6 +162,7 @@ class AccountController extends BaseController
                     'createTime' => time(),
                     'privilegeIds' => json_encode([])
                 ]);
+                $this->setPrivileges(['id' => $result]);
                 return successJson($res);
             } else {
                 return errorJson($result);
@@ -245,12 +246,14 @@ class AccountController extends BaseController
                     'createTime' => time(),
                     'lastUpdateTime' => 0
                 ]);
+
+                $this->setPrivileges(['id' => $departmentResult]);
+
             } else {
                 DB::rollback();
                 return errorJson('创建部门失败：' . $departmentResult);
             }
 
-
             // 2. 创建账号
             $accountParams = [
                 'userName' => $accountName,
@@ -559,6 +562,7 @@ class AccountController extends BaseController
                 'syncPrivilege' => true
             ];
 
+
             // 设置请求头
             $headerData = ['client:system'];
             $header = setHeader($headerData, $authorization, 'json');
diff --git a/Server/application/api/controller/DeviceController.php b/Server/application/api/controller/DeviceController.php
index 7ebe1d28..33dd45d0 100644
--- a/Server/application/api/controller/DeviceController.php
+++ b/Server/application/api/controller/DeviceController.php
@@ -690,6 +690,11 @@ class DeviceController extends BaseController
             'lastUpdateTime' => isset($item['lastUpdateTime']) ? ($item['lastUpdateTime'] == '0001-01-01T00:00:00' ? 0 : strtotime($item['lastUpdateTime'])) : 0
         ];
 
+        if (!empty($data['alive'])){
+            $data['aliveTime'] = time();
+        }
+
+
         // 使用imei作为唯一性判断
         $device = DeviceModel::where('id', $item['id'])->find();
 
diff --git a/Server/application/api/controller/WechatController.php b/Server/application/api/controller/WechatController.php
index 947b0e1d..b3903bc4 100644
--- a/Server/application/api/controller/WechatController.php
+++ b/Server/application/api/controller/WechatController.php
@@ -43,7 +43,6 @@ class WechatController extends BaseController
                 'pageIndex' => !empty($pageIndex) ? $pageIndex : $this->request->param('pageIndex', 0),
                 'pageSize' => !empty($pageSize) ? $pageSize : $this->request->param('pageSize', 10)
             ];
-
             // 设置请求头
             $headerData = ['client:system'];
             $header = setHeader($headerData, $authorization, 'plain');
@@ -51,7 +50,6 @@ class WechatController extends BaseController
             // 发送请求获取基本信息
             $result = requestCurl($this->baseUrl . 'api/WechatAccount/list', $params, 'GET', $header);
             $response = handleApiResponse($result);
-            
             // 保存基本数据到数据库
             if (!empty($response['results'])) {
                 foreach ($response['results'] as $item) {
@@ -169,6 +167,12 @@ class WechatController extends BaseController
                     'wechatAlive' => isset($data['wechatAlive'][$wechatId]) ? (int)$data['wechatAlive'][$wechatId] : 0,
                     'updateTime' => time()
                 ];
+
+                if (!empty($updateData['wechatAlive'])) {
+                    $updateData['wechatAliveTime'] =  time();
+                }
+
+
                 // 更新数据库
                 Db::table('s2_wechat_account')
                     ->where('id', $wechatId)
diff --git a/Server/application/chukebao/config/route.php b/Server/application/chukebao/config/route.php
index 353f4877..289e6fb0 100644
--- a/Server/application/chukebao/config/route.php
+++ b/Server/application/chukebao/config/route.php
@@ -13,6 +13,7 @@ Route::group('v1/', function () {
         Route::group('wechatFriend/', function () {
             Route::get('list', 'app\chukebao\controller\WechatFriendController@getList'); // 获取好友列表
             Route::get('detail', 'app\chukebao\controller\WechatFriendController@getDetail'); // 获取好友详情
+            Route::post('updateInfo', 'app\chukebao\controller\WechatFriendController@updateFriendInfo'); // 更新好友资料
         });
         //群相关
         Route::group('wechatChatroom/', function () {
@@ -26,6 +27,11 @@ Route::group('v1/', function () {
             Route::get('list', 'app\chukebao\controller\CustomerServiceController@getList'); // 获取好友列表
         });
 
+        //账号管理
+        Route::group('accounts/', function () {
+            Route::get('list', 'app\chukebao\controller\AccountsController@getList'); // 获取账号列表
+        });
+
         //客服相关
         Route::group('message/', function () {
             Route::get('list', 'app\chukebao\controller\MessageController@getList'); // 获取好友列表
diff --git a/Server/application/chukebao/controller/AccountsController.php b/Server/application/chukebao/controller/AccountsController.php
new file mode 100644
index 00000000..c69d9534
--- /dev/null
+++ b/Server/application/chukebao/controller/AccountsController.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace app\chukebao\controller;
+
+use library\ResponseHelper;
+use think\Db;
+
+class AccountsController extends BaseController
+{
+    /**
+     * 获取账号列表（过滤掉后缀为 _offline 与 _delete 的账号）
+     * @return \think\response\Json
+     */
+    public function getList()
+    {
+        try {
+            $companyId = $this->getUserInfo('companyId');
+        } catch (\Exception $e) {
+            return ResponseHelper::error($e->getMessage(), $e->getCode() ?: 401);
+        }
+
+        if (empty($companyId)) {
+            return ResponseHelper::error('请先登录', 401);
+        }
+
+        $page = max(1, intval($this->request->param('page', 1)));
+        $limit = max(1, intval($this->request->param('limit', 10)));
+        $keyword = trim((string)$this->request->param('keyword', ''));
+
+        $query = Db::table('s2_company_account')
+            ->alias('a')
+            ->where([
+                ['a.departmentId', '=', $companyId],
+                ['a.status', '=', 0],
+            ])
+            ->whereNotLike('a.userName', '%_offline')
+            ->whereNotLike('a.userName', '%_delete');
+
+        if ($keyword !== '') {
+            $query->where(function ($subQuery) use ($keyword) {
+                $likeKeyword = '%' . $keyword . '%';
+                $subQuery->whereLike('a.userName', $likeKeyword)
+                    ->whereOrLike('a.realName', $likeKeyword)
+                    ->whereOrLike('a.nickname', $likeKeyword);
+            });
+        }
+
+        $total = (clone $query)->count();
+        $list = $query->field([
+                'a.id',
+                'a.userName',
+                'a.realName',
+                'a.nickname',
+                'a.departmentId',
+                'a.departmentName',
+                'a.avatar'
+            ])
+            ->order('a.id', 'desc')
+            ->page($page, $limit)
+            ->select();
+
+
+
+        return ResponseHelper::success([
+            'total' => $total,
+            'list' => $list,
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/Server/application/chukebao/controller/CustomerServiceController.php b/Server/application/chukebao/controller/CustomerServiceController.php
index deb955bc..d0eefb66 100644
--- a/Server/application/chukebao/controller/CustomerServiceController.php
+++ b/Server/application/chukebao/controller/CustomerServiceController.php
@@ -21,8 +21,12 @@ class CustomerServiceController extends BaseController
         // 确保即使有空数组也不会报错，并且去除重复值
         $accountIds = array_unique(array_merge($accountIds1 ?: [], $accountIds2 ?: []));
 
+
+
+        $wechatAliveTime = time() - 86400 * 30;
         $list = Db::table('s2_wechat_account')
             ->whereIn('id',$accountIds)
+            ->where('wechatAliveTime','>',$wechatAliveTime)
             ->order('id desc')
             ->group('id')
             ->select();
diff --git a/Server/application/chukebao/controller/MessageController.php b/Server/application/chukebao/controller/MessageController.php
index 5a6402c2..93f491a9 100644
--- a/Server/application/chukebao/controller/MessageController.php
+++ b/Server/application/chukebao/controller/MessageController.php
@@ -20,7 +20,7 @@ class MessageController extends BaseController
 
         $friends = Db::table('s2_wechat_friend')
             ->where(['accountId' => $accountId, 'isDeleted' => 0])
-            ->column('id,nickname,avatar,conRemark,labels,groupId,wechatAccountId,wechatId');
+            ->column('id,nickname,avatar,conRemark,labels,groupId,wechatAccountId,wechatId,extendFields,phone,region');
 
 
         // 构建好友子查询
@@ -119,7 +119,11 @@ class MessageController extends BaseController
                 $v['groupId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['groupId'] : '';
                 $v['wechatAccountId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['wechatAccountId'] : '';
                 $v['wechatId'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['wechatId'] : '';
+                $v['extendFields'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['extendFields'] : [];
+                $v['region'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['region'] : '';
+                $v['phone'] = !empty($friends[$v['wechatFriendId']]) ? $friends[$v['wechatFriendId']]['phone'] : '';
                 $v['labels'] = !empty($friends[$v['wechatFriendId']]) ? json_decode($friends[$v['wechatFriendId']]['labels'], true) : [];
+
                 $unreadCount = isset($friendUnreadMap[$v['wechatFriendId']]) ? (int)$friendUnreadMap[$v['wechatFriendId']] : 0;
                 $v['aiType'] = isset($aiTypeData[$v['wechatFriendId']]) ? $aiTypeData[$v['wechatFriendId']] : 0;
                 unset($v['chatroomId']);
@@ -150,7 +154,6 @@ class MessageController extends BaseController
 
         }
         unset($v);
-
         return ResponseHelper::success($list);
     }
 
diff --git a/Server/application/chukebao/controller/WechatFriendController.php b/Server/application/chukebao/controller/WechatFriendController.php
index 5851e0f8..644bd0a9 100644
--- a/Server/application/chukebao/controller/WechatFriendController.php
+++ b/Server/application/chukebao/controller/WechatFriendController.php
@@ -23,53 +23,9 @@ class WechatFriendController extends BaseController
         $total = $query->count();
         $list = $query->page($page, $limit)->select();
 
-
          // 提取所有好友ID
         $friendIds = array_column($list, 'id');
 
-        /*  // 一次性查询所有好友的未读消息数量
-          $unreadCounts = [];
-          if (!empty($friendIds)) {
-              $unreadResults = Db::table('s2_wechat_message')
-                  ->field('wechatFriendId, COUNT(*) as count')
-                  ->where('wechatFriendId', 'in', $friendIds)
-                  ->where('isRead', 0)
-                  ->group('wechatFriendId')
-                  ->select();
-              if (!empty($unreadResults)) {
-                  foreach ($unreadResults as $result) {
-                      $unreadCounts[$result['wechatFriendId']] = $result['count'];
-                  }
-              }
-          }
-
-          // 一次性查询所有好友的最新消息
-         $latestMessages = [];
-          if (!empty($friendIds)) {
-              // 使用子查询获取每个好友的最新消息ID
-              $subQuery = Db::table('s2_wechat_message')
-                  ->field('MAX(id) as max_id, wechatFriendId')
-                  ->where('wechatFriendId', 'in', $friendIds)
-                  ->group('wechatFriendId')
-                  ->buildSql();
-
-              if (!empty($subQuery)) {
-                  // 查询最新消息的详细信息
-                  $messageResults = Db::table('s2_wechat_message')
-                      ->alias('m')
-                      ->join([$subQuery => 'sub'], 'm.id = sub.max_id')
-                      ->field('m.*, sub.wechatFriendId')
-                      ->select();
-
-                  if (!empty($messageResults)) {
-                      foreach ($messageResults as $message) {
-                          $latestMessages[$message['wechatFriendId']] = $message;
-                      }
-                  }
-              }
-          }*/
-
-
         $aiTypeData = [];
         if (!empty($friendIds)) {
             $aiTypeData = FriendSettings::where('friendId', 'in', $friendIds)->column('friendId,type');
@@ -83,18 +39,6 @@ class WechatFriendController extends BaseController
             $v['createTime'] = !empty($v['createTime']) ? date('Y-m-d H:i:s', $v['createTime']) : '';
             $v['updateTime'] = !empty($v['updateTime']) ? date('Y-m-d H:i:s', $v['updateTime']) : '';
             $v['passTime'] = !empty($v['passTime']) ? date('Y-m-d H:i:s', $v['passTime']) : '';
-
-
-           /* $config = [
-                'unreadCount' => isset($unreadCounts[$v['id']]) ? $unreadCounts[$v['id']] : 0,
-                'chat' => isset($latestMessages[$v['id']]),
-                'msgTime' => isset($latestMessages[$v['id']]) ? $latestMessages[$v['id']]['wechatTime'] : 0
-            ];
-
-            // 将消息配置添加到好友数据中
-            $v['config'] = $config;*/
-
-
             $v['aiType'] = isset($aiTypeData[$v['id']]) ? $aiTypeData[$v['id']] : 0;
         }
         unset($v);
@@ -141,4 +85,85 @@ class WechatFriendController extends BaseController
         
         return ResponseHelper::success(['detail' => $friend]);
     }
+
+    /**
+     * 更新好友资料（公司、姓名、手机号等字段可单独更新）
+     * @return \think\response\Json
+     */
+    public function updateFriendInfo()
+    {
+        $friendId = $this->request->param('id');
+        $accountId = $this->getUserInfo('s2_accountId');
+
+        if (empty($accountId)) {
+            return ResponseHelper::error('请先登录');
+        }
+
+        if (empty($friendId)) {
+            return ResponseHelper::error('好友ID不能为空');
+        }
+
+        $friend = Db::table('s2_wechat_friend')
+            ->where(['id' => $friendId, 'accountId' => $accountId, 'isDeleted' => 0])
+            ->find();
+
+        if (empty($friend)) {
+            return ResponseHelper::error('好友不存在或无权限操作');
+        }
+
+        $requestData = $this->request->param();
+        $updatableColumns = [
+            'phone',
+        ];
+        $columnUpdates = [];
+
+        foreach ($updatableColumns as $field) {
+            if (array_key_exists($field, $requestData)) {
+                $columnUpdates[$field] = $requestData[$field];
+            }
+        }
+
+        $extendFieldsData = [];
+        if (!empty($friend['extendFields'])) {
+            $decodedExtend = json_decode($friend['extendFields'], true);
+            $extendFieldsData = is_array($decodedExtend) ? $decodedExtend : [];
+        }
+
+        $extendFieldKeys = [
+            'company',
+            'name',
+            'position',
+            'email',
+            'address',
+            'wechat',
+            'qq',
+            'remark'
+        ];
+        $extendFieldsUpdated = false;
+
+        foreach ($extendFieldKeys as $key) {
+            if (array_key_exists($key, $requestData)) {
+                $extendFieldsData[$key] = $requestData[$key];
+                $extendFieldsUpdated = true;
+            }
+        }
+
+        if ($extendFieldsUpdated) {
+            $columnUpdates['extendFields'] = json_encode($extendFieldsData, JSON_UNESCAPED_UNICODE);
+        }
+
+        if (empty($columnUpdates)) {
+            return ResponseHelper::error('没有可更新的字段');
+        }
+
+        $columnUpdates['updateTime'] = time();
+
+        try {
+            Db::table('s2_wechat_friend')->where('id', $friendId)->update($columnUpdates);
+        } catch (\Exception $e) {
+            return ResponseHelper::error('更新失败：' . $e->getMessage());
+        }
+
+        return ResponseHelper::success(['id' => $friendId]);
+    }
 }
\ No newline at end of file
diff --git a/Server/application/common/controller/Attachment.php b/Server/application/common/controller/Attachment.php
index 7a2973bf..39e7984f 100644
--- a/Server/application/common/controller/Attachment.php
+++ b/Server/application/common/controller/Attachment.php
@@ -27,7 +27,7 @@ class Attachment extends Controller
             // 验证文件
             $validate = \think\facade\Validate::rule([
                 'file' => [
-                    'fileSize' => 10485760, // 10MB
+                    'fileSize' => 50485760, // 50MB
                     'fileExt' => 'jpg,jpeg,png,gif,doc,docx,pdf,zip,rar,mp4,mp3,csv,xlsx,xls,ppt,pptx,txt',
                 ]
             ]);
diff --git a/Server/application/common/model/User.php b/Server/application/common/model/User.php
index 9bb3450b..e5397c4d 100644
--- a/Server/application/common/model/User.php
+++ b/Server/application/common/model/User.php
@@ -9,7 +9,7 @@ class User extends Model
 {
     use SoftDelete;
 
-    const ADMIN_STP = 1;     // 主操盘手账号
+    const ADMIN_STP = 1;     // 操盘手账号
     const ADMIN_OTP = 0;
     const NOT_USER = -1;      // 非登录用户用于任务操作的（S2系统专属）
     const MASTER_USER = 1;    // 操盘手
diff --git a/Server/application/cunkebao/config/route.php b/Server/application/cunkebao/config/route.php
index cf64cef7..e6f7ee03 100644
--- a/Server/application/cunkebao/config/route.php
+++ b/Server/application/cunkebao/config/route.php
@@ -110,6 +110,9 @@ Route::group('v1/', function () {
         Route::get('getJdSocialMedia', 'app\cunkebao\controller\WorkbenchController@getJdSocialMedia'); // 获取京东联盟导购媒体
         Route::get('getJdPromotionSite', 'app\cunkebao\controller\WorkbenchController@getJdPromotionSite'); // 获取京东联盟广告位
         Route::get('changeLink', 'app\cunkebao\controller\WorkbenchController@changeLink'); // 获取京东联盟广告位
+        
+        Route::get('group-push-stats', 'app\cunkebao\controller\WorkbenchController@getGroupPushStats'); // 获取群发统计数据
+        Route::get('group-push-history', 'app\cunkebao\controller\WorkbenchController@getGroupPushHistory'); // 获取推送历史记录列表
     });
 
     // 内容库相关
diff --git a/Server/application/cunkebao/controller/ContentLibraryController.php b/Server/application/cunkebao/controller/ContentLibraryController.php
index 0ddac5b7..c527021c 100644
--- a/Server/application/cunkebao/controller/ContentLibraryController.php
+++ b/Server/application/cunkebao/controller/ContentLibraryController.php
@@ -111,10 +111,16 @@ class ContentLibraryController extends Controller
         $sourceType = $this->request->param('sourceType', ''); // 新增：来源类型，1=好友，2=群
 
         $where = [
-            ['userId', '=', $this->request->userInfo['id']],
+            ['companyId' , '=', $this->request->userInfo['companyId']],
             ['isDel', '=', 0]  // 只查询未删除的记录
         ];
 
+        if(empty($this->request->userInfo['isAdmin'])){
+            $where[] =  ['userId', '=', $this->request->userInfo['id']];
+        }
+
+
+
         // 添加名称模糊搜索
         if ($keyword !== '') {
             $where[] = ['name', 'like', '%' . $keyword . '%'];
@@ -307,11 +313,18 @@ class ContentLibraryController extends Controller
             return json(['code' => 400, 'msg' => '内容库名称不能为空']);
         }
 
+
+        $where = [
+            ['companyId' , '=', $this->request->userInfo['companyId']],
+            ['isDel', '=', 0]  // 只查询未删除的记录
+        ];
+
+        if(empty($this->request->userInfo['isAdmin'])){
+            $where[] =  ['userId', '=', $this->request->userInfo['id']];
+        }
+
         // 查询内容库是否存在
-        $library = ContentLibrary::where([
-            ['id', '=', $param['id']],
-            ['userId', '=', $this->request->userInfo['id']]
-        ])->find();
+        $library = ContentLibrary::where($where)->find();
 
         if (!$library) {
             return json(['code' => 500, 'msg' => '内容库不存在']);
@@ -766,16 +779,20 @@ class ContentLibraryController extends Controller
         $content = Request::param('content', '');
         $companyId = $this->request->userInfo['companyId'];
         // 简单验证
-        if (empty($id)) {
+        if (empty($id) && empty($content)) {
             return json(['code' => 400, 'msg' => '参数错误']);
         }
 
-        // 查询内容项目是否存在并检查权限
-        $item = ContentItem::alias('ci')
-            ->join('content_library cl', 'ci.libraryId = cl.id')
-            ->where(['ci.id' => $id, 'ci.isDel' => 0, 'cl.isDel' => 0, 'cl.companyId' => $companyId])
-            ->field('ci.*')
-            ->find();
+        if(!empty($id)) {
+            // 查询内容项目是否存在并检查权限
+            $item = ContentItem::alias('ci')
+                ->join('content_library cl', 'ci.libraryId = cl.id')
+                ->where(['ci.id' => $id, 'ci.isDel' => 0, 'cl.isDel' => 0, 'cl.companyId' => $companyId])
+                ->field('ci.*')
+                ->find();
+        }else{
+            $item['content'] = $content;
+        }
 
         if (empty($item)) {
             return json(['code' => 500, 'msg' => '内容项目不存在或无权限操作']);
diff --git a/Server/application/cunkebao/controller/StatsController.php b/Server/application/cunkebao/controller/StatsController.php
index a47f80c8..3855da66 100644
--- a/Server/application/cunkebao/controller/StatsController.php
+++ b/Server/application/cunkebao/controller/StatsController.php
@@ -25,13 +25,18 @@ class StatsController extends Controller
      */
     public function baseInfoStats()
     {
-        $deviceNum = Db::name('device')->where(['companyId' => $this->request->userInfo['companyId'], 'deleteTime' => 0])->count();
-        $wechatNum = Db::name('wechat_customer')->where(['companyId' => $this->request->userInfo['companyId']])->count();
-        $aliveWechatNum = Db::name('wechat_customer')->alias('wc')
-            ->join('device_wechat_login dwl', 'wc.wechatId = dwl.wechatId')
-            ->where(['wc.companyId' => $this->request->userInfo['companyId'], 'dwl.alive' => 1])
-            ->group('wc.wechatId')
-            ->count();
+
+        $where = [
+            ['departmentId','=',$this->request->userInfo['companyId']]
+        ];
+        if (!empty($this->request->userInfo['isAdmin'])){
+            $where[] = ['id','=',$this->request->userInfo['s2_accountId']];
+        }
+        $accounts = Db::table('s2_company_account')->where($where)->column('id');
+
+        $deviceNum = Db::table('s2_device')->whereIn('currentAccountId',$accounts)->where(['isDeleted' => 0])->count();
+        $wechatNum = Db::table('s2_wechat_account')->whereIn('deviceAccountId',$accounts)->count();
+        $aliveWechatNum =  Db::table('s2_wechat_account')->whereIn('deviceAccountId',$accounts)->where(['wechatAlive' => 1])->count();
         $data = [
             'deviceNum' => $deviceNum,
             'wechatNum' => $wechatNum,
@@ -58,29 +63,50 @@ class StatsController extends Controller
             ->page(1, $num)
             ->select();
 
-        foreach ($planScene as &$v) {
-            $allNum = Db::name('customer_acquisition_task')->alias('ac')
-                ->join('task_customer tc', 'tc.task_id = ac.id')
-                ->where(['ac.sceneId' => $v['id'], 'ac.companyId' => $this->request->userInfo['companyId'], 'ac.deleteTime' => 0])
-                ->count();
-
-            $addNum = Db::name('customer_acquisition_task')->alias('ac')
-                ->join('task_customer tc', 'tc.task_id = ac.id')
-                ->where(['ac.sceneId' => $v['id'], 'ac.companyId' => $this->request->userInfo['companyId'], 'ac.deleteTime' => 0])
-                ->whereIn('tc.status', [1, 2, 3, 4])
-                ->count();
-
-            $passNum = Db::name('customer_acquisition_task')->alias('ac')
-                ->join('task_customer tc', 'tc.task_id = ac.id')
-                ->where(['ac.sceneId' => $v['id'], 'ac.companyId' => $this->request->userInfo['companyId'], 'ac.deleteTime' => 0])
-                ->whereIn('tc.status', [4])
-                ->count();
-
-            $v['allNum'] = $allNum;
-            $v['addNum'] = $addNum;
-            $v['passNum'] = $passNum;
+        if (empty($planScene)) {
+            return successJson([], '获取成功');
         }
-        unset($v);
+
+        $sceneIds = array_column($planScene, 'id');
+        $companyId = $this->request->userInfo['companyId'];
+
+        $stats = Db::name('customer_acquisition_task')->alias('ac')
+            ->join('task_customer tc', 'tc.task_id = ac.id')
+            ->where([
+                ['ac.companyId', '=', $companyId],
+                ['ac.deleteTime', '=', 0],
+                ['ac.sceneId', 'in', $sceneIds],
+            ])
+            ->field([
+                'ac.sceneId',
+                Db::raw('COUNT(1) as allNum'),
+                Db::raw("SUM(CASE WHEN tc.status IN (1,2,3,4) THEN 1 ELSE 0 END) as addNum"),
+                Db::raw("SUM(CASE WHEN tc.status = 4 THEN 1 ELSE 0 END) as passNum"),
+            ])
+            ->group('ac.sceneId')
+            ->select();
+
+        $statsMap = [];
+        foreach ($stats as $row) {
+            $sceneId = is_array($row) ? ($row['sceneId'] ?? 0) : ($row->sceneId ?? 0);
+            if (!$sceneId) {
+                continue;
+            }
+            $statsMap[$sceneId] = [
+                'allNum' => (int)(is_array($row) ? ($row['allNum'] ?? 0) : ($row->allNum ?? 0)),
+                'addNum' => (int)(is_array($row) ? ($row['addNum'] ?? 0) : ($row->addNum ?? 0)),
+                'passNum' => (int)(is_array($row) ? ($row['passNum'] ?? 0) : ($row->passNum ?? 0)),
+            ];
+        }
+
+        foreach ($planScene as &$item) {
+            $sceneStats = $statsMap[$item['id']] ?? ['allNum' => 0, 'addNum' => 0, 'passNum' => 0];
+            $item['allNum'] = $sceneStats['allNum'];
+            $item['addNum'] = $sceneStats['addNum'];
+            $item['passNum'] = $sceneStats['passNum'];
+        }
+        unset($item);
+
         return successJson($planScene, '获取成功');
     }
 
@@ -150,44 +176,62 @@ class StatsController extends Controller
         $companyId = $this->request->userInfo['companyId'];
         $days = 7;
 
-        $dates = [];
+        $endTime = strtotime(date('Y-m-d 23:59:59'));
+        $startTime = strtotime(date('Y-m-d 00:00:00', strtotime('-' . ($days - 1) . ' day')));
+
+        $dateMap = [];
+        $dateLabels = [];
+        for ($i = 0; $i < $days; $i++) {
+            $currentDate = date('Y-m-d', strtotime("-" . ($days - 1 - $i) . " day"));
+            $weekIndex = date("w", strtotime($currentDate));
+            $dateMap[$currentDate] = self::WEEK[$weekIndex];
+            $dateLabels[] = self::WEEK[$weekIndex];
+        }
+
+        $baseWhere = [
+            ['ac.companyId', '=', $companyId],
+            ['ac.deleteTime', '=', 0],
+        ];
+
+        $fetchCounts = function (string $timeField, array $status = []) use ($baseWhere, $startTime, $endTime) {
+            $query = Db::name('customer_acquisition_task')->alias('ac')
+                ->join('task_customer tc', 'tc.task_id = ac.id')
+                ->where($baseWhere)
+                ->whereBetween('tc.' . $timeField, [$startTime, $endTime]);
+            if (!empty($status)) {
+                $query->whereIn('tc.status', $status);
+            }
+            $rows = $query->field([
+                "FROM_UNIXTIME(tc.{$timeField}, '%Y-%m-%d')" => 'day',
+                'COUNT(1)' => 'total'
+            ])->group('day')->select();
+
+            $result = [];
+            foreach ($rows as $row) {
+                $day = is_array($row) ? ($row['day'] ?? '') : ($row->day ?? '');
+                $total = (int)(is_array($row) ? ($row['total'] ?? 0) : ($row->total ?? 0));
+                if ($day) {
+                    $result[$day] = $total;
+                }
+            }
+            return $result;
+        };
+
+        $allNumDict = $fetchCounts('createTime');
+        $addNumDict = $fetchCounts('updateTime', [1, 2, 3, 4]);
+        $passNumDict = $fetchCounts('updateTime', [4]);
+
         $allNum = [];
         $addNum = [];
         $passNum = [];
-
-        for ($i = $days - 1; $i >= 0; $i--) {
-            $date = date('Y-m-d', strtotime("-$i day"));
-            $start = strtotime($date . ' 00:00:00');
-            $end = strtotime($date . ' 23:59:59');
-
-            // 获客总量
-            $allNum[] = Db::name('customer_acquisition_task')->alias('ac')
-                ->join('task_customer tc', 'tc.task_id = ac.id')
-                ->where(['ac.companyId' => $companyId, 'ac.deleteTime' => 0])
-                ->where('tc.createTime', 'between', [$start, $end])
-                ->count();
-
-            // 添加量
-            $addNum[] = Db::name('customer_acquisition_task')->alias('ac')
-                ->join('task_customer tc', 'tc.task_id = ac.id')
-                ->where(['ac.companyId' => $companyId, 'ac.deleteTime' => 0])
-                ->where('tc.updateTime', 'between', [$start, $end])
-                ->whereIn('tc.status', [1, 2, 3, 4])
-                ->count();
-
-            // 通过量
-            $passNum[] = Db::name('customer_acquisition_task')->alias('ac')
-                ->join('task_customer tc', 'tc.task_id = ac.id')
-                ->where(['ac.companyId' => $companyId, 'ac.deleteTime' => 0])
-                ->where('tc.updateTime', 'between', [$start, $end])
-                ->whereIn('tc.status', [4])
-                ->count();
-
-            $week = date("w", strtotime($date));
-            $dates[] = self::WEEK[$week];
+        foreach (array_keys($dateMap) as $dateKey) {
+            $allNum[] = $allNumDict[$dateKey] ?? 0;
+            $addNum[] = $addNumDict[$dateKey] ?? 0;
+            $passNum[] = $passNumDict[$dateKey] ?? 0;
         }
+
         $data = [
-            'date' => $dates,
+            'date' => $dateLabels,
             'allNum' => $allNum,
             'addNum' => $addNum,
             'passNum' => $passNum,
@@ -360,19 +404,26 @@ class StatsController extends Controller
         $isAdmin = $this->request->userInfo['isAdmin'];
 
 
-        $device = Db::name('device')->where(['companyId' => $companyId,'deleteTime' => 0]);
-        $wechat = Db::name('wechat_customer')->where(['companyId' => $companyId]);
-        $contentLibrary = Db::name('content_library')->where(['companyId' => $companyId,'isDel' => 0]);
-        $user = Db::name('wechat_friendship')->where(['companyId' => $companyId,'deleteTime' => 0]);
+        $where = [
+            ['departmentId','=',$companyId]
+        ];
+        if (!empty($this->request->userInfo['isAdmin'])){
+            $where[] = ['id','=',$this->request->userInfo['s2_accountId']];
+        }
+        $accounts = Db::table('s2_company_account')->where($where)->column('id');
+       
 
+        $userNum = Db::table('s2_wechat_friend')->whereIn('accountId',$accounts)->where(['isDeleted' => 0])->count();
+        $deviceNum = Db::table('s2_device')->whereIn('currentAccountId',$accounts)->where(['isDeleted' => 0])->count();
+        $wechatNum = Db::table('s2_wechat_account')->whereIn('deviceAccountId',$accounts)->count();
+
+
+        $contentLibrary = Db::name('content_library')->where(['companyId' => $companyId,'isDel' => 0]);
         if(empty($isAdmin)){
             $contentLibrary = $contentLibrary->where(['userId' => $userId]);
         }
-
-        $deviceNum = $device->count();
-        $wechatNum = $wechat->count();
         $contentLibraryNum = $contentLibrary->count();
-        $userNum = $user->count();
+
 
         $data = [
           'deviceNum' => $deviceNum,
diff --git a/Server/application/cunkebao/controller/TokensController.php b/Server/application/cunkebao/controller/TokensController.php
index 1db47b44..a72ff49d 100644
--- a/Server/application/cunkebao/controller/TokensController.php
+++ b/Server/application/cunkebao/controller/TokensController.php
@@ -116,13 +116,13 @@ class TokensController extends BaseController
             $res = $paymentService->queryOrder($orderNo);
             $res = json_decode($res, true);
             if ($res['code'] == 200) {
-                return ResponseHelper::success('', '订单已支付');
+                return ResponseHelper::success($order, '订单已支付');
             } else {
                 $errorMsg = !empty($order['payInfo']) ? $order['payInfo'] : '订单未支付';
-                return ResponseHelper::error($errorMsg);
+                return ResponseHelper::success($order,$errorMsg,400);
             }
         } else {
-            return ResponseHelper::success('', '订单已支付');
+            return ResponseHelper::success($order, '订单已支付');
         }
     }
 
diff --git a/Server/application/cunkebao/controller/WorkbenchController.php b/Server/application/cunkebao/controller/WorkbenchController.php
index fde42fa7..62e17116 100644
--- a/Server/application/cunkebao/controller/WorkbenchController.php
+++ b/Server/application/cunkebao/controller/WorkbenchController.php
@@ -49,6 +49,19 @@ class WorkbenchController extends Controller
         // 获取请求参数
         $param = $this->request->post();
 
+        // 根据业务默认值补全参数
+        if (
+            isset($param['type']) &&
+            intval($param['type']) === self::TYPE_GROUP_PUSH
+        ) {
+            if (empty($param['startTime'])) {
+                $param['startTime'] = '09:00';
+            }
+            if (empty($param['endTime'])) {
+                $param['endTime'] = '21:00';
+            }
+        }
+
         // 验证数据
         $validate = new WorkbenchValidate;
         if (!$validate->scene('create')->check($param)) {
@@ -106,35 +119,13 @@ class WorkbenchController extends Controller
                     $config->save();
                     break;
                 case self::TYPE_GROUP_PUSH: // 群消息推送
+                    $ownerWechatIds = $this->normalizeOwnerWechatIds($param['ownerWechatIds'] ?? []);
+                    $groupPushData = $this->prepareGroupPushData($param, $ownerWechatIds);
+                    $groupPushData['workbenchId'] = $workbench->id;
+                    $groupPushData['createTime'] = time();
+                    $groupPushData['updateTime'] = time();
                     $config = new WorkbenchGroupPush;
-                    $config->workbenchId = $workbench->id;
-                    $config->pushType = !empty($param['pushType']) ? 1 : 0; // 推送方式：定时/立即
-                    $config->targetType = !empty($param['targetType']) ? intval($param['targetType']) : 1; // 推送目标类型：1=群推送，2=好友推送
-                    $config->startTime = $param['startTime'];
-                    $config->endTime = $param['endTime'];
-                    $config->maxPerDay = intval($param['maxPerDay']); // 每日推送数
-                    $config->pushOrder = $param['pushOrder']; // 推送顺序
-                    // 根据targetType存储不同的数据
-                    if ($config->targetType == 1) {
-                        // 群推送
-                        $config->isLoop = !empty($param['isLoop']) ? 1 : 0; // 是否循环
-                        $config->groups = json_encode($param['wechatGroups'] ?? [], JSON_UNESCAPED_UNICODE); // 群组信息
-                        $config->friends = json_encode([], JSON_UNESCAPED_UNICODE); // 好友信息为空数组
-                        $config->devices = json_encode([], JSON_UNESCAPED_UNICODE); // 群推送不需要设备
-                    } else {
-                        // 好友推送：isLoop必须为0，设备必填
-                        $config->isLoop = 0; // 好友推送时强制为0
-                        $config->friends = json_encode($param['wechatFriends'] ?? [], JSON_UNESCAPED_UNICODE); // 好友信息（可以为空数组）
-                        $config->groups = json_encode([], JSON_UNESCAPED_UNICODE); // 群组信息为空数组
-                        $config->devices = json_encode($param['deviceGroups'] ?? [], JSON_UNESCAPED_UNICODE); // 设备信息（必填）
-                    }
-                    $config->status = !empty($param['status']) ? 1 : 0; // 是否启用
-                    $config->contentLibraries = json_encode($param['contentGroups'], JSON_UNESCAPED_UNICODE); // 内容库信息
-                    $config->socialMediaId = !empty($param['socialMediaId']) ? $param['socialMediaId'] : '';
-                    $config->promotionSiteId = !empty($param['promotionSiteId']) ? $param['promotionSiteId'] : '';
-                    $config->createTime = time();
-                    $config->updateTime = time();
-                    $config->save();
+                    $config->save($groupPushData);
                     break;
                 case self::TYPE_GROUP_CREATE: // 自动建群
                     $config = new WorkbenchGroupCreate;
@@ -203,10 +194,16 @@ class WorkbenchController extends Controller
         $keyword = $this->request->param('keyword', '');
 
         $where = [
-            ['userId', '=', $this->request->userInfo['id']],
+            ['companyId', '=', $this->request->userInfo['companyId']],
             ['isDel', '=', 0]
         ];
 
+        if (empty($this->request->userInfo['isAdmin'])) {
+            $where[] =  ['userId', '=', $this->request->userInfo['id']];
+        }
+
+
+
         // 添加类型筛选
         if ($type !== '') {
             $where[] = ['type', '=', $type];
@@ -229,12 +226,12 @@ class WorkbenchController extends Controller
                 $query->field('workbenchId,distributeType,maxPerDay,timeType,startTime,endTime,devices,pools,account');
             },
             'groupPush' => function ($query) {
-                $query->field('workbenchId,pushType,targetType,startTime,endTime,maxPerDay,pushOrder,isLoop,status,groups,friends,devices,contentLibraries');
+                $query->field('workbenchId,pushType,targetType,groupPushSubType,startTime,endTime,maxPerDay,pushOrder,isLoop,status,groups,friends,ownerWechatIds,trafficPools,contentLibraries,friendIntervalMin,friendIntervalMax,messageIntervalMin,messageIntervalMax,isRandomTemplate,postPushTags,announcementContent,enableAiRewrite,aiRewritePrompt');
             },
-            'groupCreate' => function($query) {
+            'groupCreate' => function ($query) {
                 $query->field('workbenchId,devices,startTime,endTime,groupSizeMin,groupSizeMax,maxGroupsPerDay,groupNameTemplate,groupDescription,poolGroups,wechatGroups');
             },
-            'importContact' => function($query) {
+            'importContact' => function ($query) {
                 $query->field('workbenchId,devices,pools,num,remarkType,remark,clearContact,startTime,endTime');
             },
             'user' => function ($query) {
@@ -296,33 +293,52 @@ class WorkbenchController extends Controller
                                 $item->config->contentGroupsOptions = [];
                             }
                         }
-                        unset($item->momentsSync, $item->moments_sync,$item->config->contentLibraries);
+                        unset($item->momentsSync, $item->moments_sync, $item->config->contentLibraries);
                         break;
                     case self::TYPE_GROUP_PUSH:
                         if (!empty($item->groupPush)) {
                             $item->config = $item->groupPush;
                             $item->config->pushType = $item->config->pushType;
                             $item->config->targetType = isset($item->config->targetType) ? intval($item->config->targetType) : 1; // 默认1=群推送
+                            $item->config->groupPushSubType = isset($item->config->groupPushSubType) ? intval($item->config->groupPushSubType) : 1; // 默认1=群群发
                             $item->config->startTime = $item->config->startTime;
                             $item->config->endTime = $item->config->endTime;
                             $item->config->maxPerDay = $item->config->maxPerDay;
                             $item->config->pushOrder = $item->config->pushOrder;
                             $item->config->isLoop = $item->config->isLoop;
                             $item->config->status = $item->config->status;
+                            $item->config->ownerWechatIds = json_decode($item->config->ownerWechatIds ?? '[]', true) ?: [];
                             // 根据targetType解析不同的数据
                             if ($item->config->targetType == 1) {
                                 // 群推送
                                 $item->config->wechatGroups = json_decode($item->config->groups, true) ?: [];
                                 $item->config->wechatFriends = [];
-                                $item->config->deviceGroups = [];
+                                // 群推送不需要devices字段
+                                // 群公告相关字段
+                                if ($item->config->groupPushSubType == 2) {
+                                    $item->config->announcementContent = isset($item->config->announcementContent) ? $item->config->announcementContent : '';
+                                    $item->config->enableAiRewrite = isset($item->config->enableAiRewrite) ? intval($item->config->enableAiRewrite) : 0;
+                                    $item->config->aiRewritePrompt = isset($item->config->aiRewritePrompt) ? $item->config->aiRewritePrompt : '';
+                                }
+                                $item->config->trafficPools = [];
                             } else {
                                 // 好友推送
                                 $item->config->wechatFriends = json_decode($item->config->friends, true) ?: [];
                                 $item->config->wechatGroups = [];
-                                $item->config->deviceGroups = json_decode($item->config->devices ?? '[]', true) ?: [];
+                                $item->config->trafficPools = json_decode($item->config->trafficPools ?? '[]', true) ?: [];
                             }
                             $item->config->contentLibraries = json_decode($item->config->contentLibraries, true);
+                            $item->config->postPushTags = json_decode($item->config->postPushTags ?? '[]', true) ?: [];
                             $item->config->lastPushTime = '';
+                            if (!empty($item->config->ownerWechatIds)) {
+                                $ownerWechatOptions = Db::name('wechat_account')
+                                    ->whereIn('id', $item->config->ownerWechatIds)
+                                    ->field('id,wechatId,nickName,avatar,alias')
+                                    ->select();
+                                $item->config->ownerWechatOptions = $ownerWechatOptions;
+                            } else {
+                                $item->config->ownerWechatOptions = [];
+                            }
                         }
                         unset($item->groupPush, $item->group_push);
                         break;
@@ -438,20 +454,27 @@ class WorkbenchController extends Controller
                 $query->field('workbenchId,distributeType,maxPerDay,timeType,startTime,endTime,devices,pools,account');
             },
             'groupPush' => function ($query) {
-                $query->field('workbenchId,pushType,targetType,startTime,endTime,maxPerDay,pushOrder,isLoop,status,groups,friends,devices,contentLibraries');
+                $query->field('workbenchId,pushType,targetType,groupPushSubType,startTime,endTime,maxPerDay,pushOrder,isLoop,status,groups,friends,ownerWechatIds,trafficPools,contentLibraries,friendIntervalMin,friendIntervalMax,messageIntervalMin,messageIntervalMax,isRandomTemplate,postPushTags,announcementContent,enableAiRewrite,aiRewritePrompt');
             },
-             'groupCreate' => function($query) {
-                 $query->field('workbenchId,devices,startTime,endTime,groupSizeMin,groupSizeMax,maxGroupsPerDay,groupNameTemplate,groupDescription,poolGroups,wechatGroups');
-             },
-            'importContact' => function($query) {
+            'groupCreate' => function ($query) {
+                $query->field('workbenchId,devices,startTime,endTime,groupSizeMin,groupSizeMax,maxGroupsPerDay,groupNameTemplate,groupDescription,poolGroups,wechatGroups');
+            },
+            'importContact' => function ($query) {
                 $query->field('workbenchId,devices,pools,num,remarkType,remark,clearContact,startTime,endTime');
             },
         ];
-        $workbench = Workbench::where([
+
+        $where = [
             ['id', '=', $id],
-            ['userId', '=', $this->request->userInfo['id']],
+            ['companyId', '=', $this->request->userInfo['companyId']],
             ['isDel', '=', 0]
-        ])
+        ];
+        if (empty($this->request->userInfo['isAdmin'])) {
+            $where[] =  ['userId', '=', $this->request->userInfo['id']];
+        }
+
+
+        $workbench = Workbench::where($where)
             ->field('id,name,type,status,autoStart,createTime,updateTime,companyId')
             ->with($with)
             ->find();
@@ -510,19 +533,29 @@ class WorkbenchController extends Controller
                 if (!empty($workbench->groupPush)) {
                     $workbench->config = $workbench->groupPush;
                     $workbench->config->targetType = isset($workbench->config->targetType) ? intval($workbench->config->targetType) : 1; // 默认1=群推送
+                    $workbench->config->groupPushSubType = isset($workbench->config->groupPushSubType) ? intval($workbench->config->groupPushSubType) : 1; // 默认1=群群发
+                    $workbench->config->ownerWechatIds = json_decode($workbench->config->ownerWechatIds ?? '[]', true) ?: [];
                     // 根据targetType解析不同的数据
                     if ($workbench->config->targetType == 1) {
                         // 群推送
                         $workbench->config->wechatGroups = json_decode($workbench->config->groups, true) ?: [];
                         $workbench->config->wechatFriends = [];
-                        $workbench->config->deviceGroups = [];
+                        $workbench->config->trafficPools = [];
+                        // 群推送不需要devices字段
+                        // 群公告相关字段
+                        if ($workbench->config->groupPushSubType == 2) {
+                            $workbench->config->announcementContent = isset($workbench->config->announcementContent) ? $workbench->config->announcementContent : '';
+                            $workbench->config->enableAiRewrite = isset($workbench->config->enableAiRewrite) ? intval($workbench->config->enableAiRewrite) : 0;
+                            $workbench->config->aiRewritePrompt = isset($workbench->config->aiRewritePrompt) ? $workbench->config->aiRewritePrompt : '';
+                        }
                     } else {
                         // 好友推送
                         $workbench->config->wechatFriends = json_decode($workbench->config->friends, true) ?: [];
                         $workbench->config->wechatGroups = [];
-                        $workbench->config->deviceGroups = json_decode($workbench->config->devices ?? '[]', true) ?: [];
+                        $workbench->config->trafficPools = json_decode($workbench->config->trafficPools ?? '[]', true) ?: [];
                     }
                     $workbench->config->contentLibraries = json_decode($workbench->config->contentLibraries, true);
+                    $workbench->config->postPushTags = json_decode($workbench->config->postPushTags ?? '[]', true) ?: [];
                     unset($workbench->groupPush, $workbench->group_push);
                 }
                 break;
@@ -629,7 +662,7 @@ class WorkbenchController extends Controller
                 ->select();
 
             foreach ($deviceList as &$device) {
-                $curstomer = WechatCustomerModel::field('friendShip')->where(['wechatId'  => $device['wechatId']])->find();
+                $curstomer = WechatCustomerModel::field('friendShip')->where(['wechatId' => $device['wechatId']])->find();
                 $device['totalFriend'] = $curstomer->friendShip->totalFriend ?? 0;
             }
             unset($device);
@@ -641,7 +674,7 @@ class WorkbenchController extends Controller
 
 
         // 获取群（当targetType=1时）
-        if (!empty($workbench->config->wechatGroups) && isset($workbench->config->targetType) && $workbench->config->targetType == 1){
+        if (!empty($workbench->config->wechatGroups) && isset($workbench->config->targetType) && $workbench->config->targetType == 1) {
             $groupList = Db::name('wechat_group')->alias('wg')
                 ->join('wechat_account wa', 'wa.wechatId = wg.ownerWechatId')
                 ->where('wg.id', 'in', $workbench->config->wechatGroups)
@@ -649,12 +682,12 @@ class WorkbenchController extends Controller
                 ->field('wg.id,wg.name as groupName,wg.ownerWechatId,wa.nickName,wa.avatar,wa.alias,wg.avatar as groupAvatar')
                 ->select();
             $workbench->config->wechatGroupsOptions = $groupList;
-        }else{
+        } else {
             $workbench->config->wechatGroupsOptions = [];
         }
 
         // 获取好友（当targetType=2时）
-        if (!empty($workbench->config->wechatFriends) && isset($workbench->config->targetType) && $workbench->config->targetType == 2){
+        if (!empty($workbench->config->wechatFriends) && isset($workbench->config->targetType) && $workbench->config->targetType == 2) {
             $friendList = Db::table('s2_wechat_friend')->alias('wf')
                 ->join('s2_wechat_account wa', 'wa.id = wf.wechatAccountId', 'left')
                 ->where('wf.id', 'in', $workbench->config->wechatFriends)
@@ -662,10 +695,26 @@ class WorkbenchController extends Controller
                 ->field('wf.id,wf.wechatId,wf.nickname as friendName,wf.avatar as friendAvatar,wf.conRemark,wf.ownerWechatId,wa.nickName as accountName,wa.avatar as accountAvatar')
                 ->select();
             $workbench->config->wechatFriendsOptions = $friendList;
-        }else{
+        } else {
             $workbench->config->wechatFriendsOptions = [];
         }
 
+        // 获取流量池（当targetType=2时）
+        if (!empty($workbench->config->trafficPools) && isset($workbench->config->targetType) && $workbench->config->targetType == 2) {
+            $poolList = Db::name('traffic_source_package')->alias('tsp')
+                ->leftJoin('traffic_source_package_item tspi', 'tspi.packageId = tsp.id and tspi.isDel = 0')
+                ->whereIn('tsp.id', $workbench->config->trafficPools)
+                ->where('tsp.isDel', 0)
+                ->whereIn('tsp.companyId', [$this->request->userInfo['companyId'], 0])
+                ->field('tsp.id,tsp.name,tsp.description,tsp.pic,COUNT(tspi.id) as itemCount')
+                ->group('tsp.id')
+                ->order('tsp.id', 'desc')
+                ->select();
+            $workbench->config->trafficPoolsOptions = $poolList;
+        } else {
+            $workbench->config->trafficPoolsOptions = [];
+        }
+
         // 获取内容库名称
         if (!empty($workbench->config->contentGroups)) {
             $libraryNames = ContentLibrary::where('id', 'in', $workbench->config->contentGroups)->select();
@@ -675,7 +724,7 @@ class WorkbenchController extends Controller
         }
 
         //账号
-        if (!empty($workbench->config->accountGroups)){
+        if (!empty($workbench->config->accountGroups)) {
             $account = Db::table('s2_company_account')->alias('a')
                 ->where(['a.departmentId' => $this->request->userInfo['companyId'], 'a.status' => 0])
                 ->whereIn('a.id', $workbench->config->accountGroups)
@@ -683,24 +732,33 @@ class WorkbenchController extends Controller
                 ->whereNotLike('a.userName', '%_delete%')
                 ->field('a.id,a.userName,a.realName,a.nickname,a.memo')
                 ->select();
-                $workbench->config->accountGroupsOptions = $account;
-        }else{
+            $workbench->config->accountGroupsOptions = $account;
+        } else {
             $workbench->config->accountGroupsOptions = [];
         }
 
-        if (!empty($workbench->config->poolGroups)){
+        if (!empty($workbench->config->poolGroups)) {
             $poolGroupsOptions = Db::name('traffic_source_package')->alias('tsp')
-                ->join('traffic_source_package_item tspi','tspi.packageId=tsp.id','left')
-                ->whereIn('tsp.companyId', [$this->request->userInfo['companyId'],0])
+                ->join('traffic_source_package_item tspi', 'tspi.packageId=tsp.id', 'left')
+                ->whereIn('tsp.companyId', [$this->request->userInfo['companyId'], 0])
                 ->whereIn('tsp.id', $workbench->config->poolGroups)
                 ->field('tsp.id,tsp.name,tsp.description,tsp.createTime,count(tspi.id) as num')
                 ->group('tsp.id')
                 ->select();
             $workbench->config->poolGroupsOptions = $poolGroupsOptions;
-        }else{
+        } else {
             $workbench->config->poolGroupsOptions = [];
         }
 
+        if (!empty($workbench->config->ownerWechatIds)) {
+            $ownerWechatOptions = Db::name('wechat_account')
+                ->whereIn('id', $workbench->config->ownerWechatIds)
+                ->field('id,wechatId,nickName,avatar,alias')
+                ->select();
+            $workbench->config->ownerWechatOptions = $ownerWechatOptions;
+        } else {
+            $workbench->config->ownerWechatOptions = [];
+        }
 
 
         return json(['code' => 200, 'msg' => '获取成功', 'data' => $workbench]);
@@ -725,12 +783,18 @@ class WorkbenchController extends Controller
             return json(['code' => 400, 'msg' => $validate->getError()]);
         }
 
-        // 查询工作台是否存在
-        $workbench = Workbench::where([
+
+        $where = [
             ['id', '=', $param['id']],
-            ['userId', '=', $this->request->userInfo['id']],
+            ['companyId', '=', $this->request->userInfo['companyId']],
             ['isDel', '=', 0]
-        ])->find();
+        ];
+        if (empty($this->request->userInfo['isAdmin'])) {
+            $where[] =  ['userId', '=', $this->request->userInfo['id']];
+        }
+
+        // 查询工作台是否存在
+        $workbench = Workbench::where($where)->find();
         if (!$workbench) {
             return json(['code' => 404, 'msg' => '工作台不存在']);
         }
@@ -797,32 +861,10 @@ class WorkbenchController extends Controller
                 case self::TYPE_GROUP_PUSH:
                     $config = WorkbenchGroupPush::where('workbenchId', $param['id'])->find();
                     if ($config) {
-                        $config->pushType = !empty($param['pushType']) ? 1 : 0; // 推送方式：定时/立即
-                        $config->targetType = !empty($param['targetType']) ? intval($param['targetType']) : 1; // 推送目标类型：1=群推送，2=好友推送
-                        $config->startTime = $param['startTime'];
-                        $config->endTime = $param['endTime'];
-                        $config->maxPerDay = intval($param['maxPerDay']); // 每日推送数
-                        $config->pushOrder = $param['pushOrder']; // 推送顺序
-                        // 根据targetType存储不同的数据
-                        if ($config->targetType == 1) {
-                            // 群推送
-                            $config->isLoop = !empty($param['isLoop']) ? 1 : 0; // 是否循环
-                            $config->groups = json_encode($param['wechatGroups'] ?? [], JSON_UNESCAPED_UNICODE); // 群组信息
-                            $config->friends = json_encode([], JSON_UNESCAPED_UNICODE); // 好友信息为空数组
-                            $config->devices = json_encode([], JSON_UNESCAPED_UNICODE); // 群推送不需要设备
-                        } else {
-                            // 好友推送：isLoop必须为0，设备必填
-                            $config->isLoop = 0; // 好友推送时强制为0
-                            $config->friends = json_encode($param['wechatFriends'] ?? [], JSON_UNESCAPED_UNICODE); // 好友信息（可以为空数组）
-                            $config->groups = json_encode([], JSON_UNESCAPED_UNICODE); // 群组信息为空数组
-                            $config->devices = json_encode($param['deviceGroups'] ?? [], JSON_UNESCAPED_UNICODE); // 设备信息（必填）
-                        }
-                        $config->status = !empty($param['status']) ? 1 : 0; // 是否启用
-                        $config->contentLibraries = json_encode($param['contentGroups'], JSON_UNESCAPED_UNICODE); // 内容库信息
-                        $config->socialMediaId = !empty($param['socialMediaId']) ? $param['socialMediaId'] : '';
-                        $config->promotionSiteId = !empty($param['promotionSiteId']) ? $param['promotionSiteId'] : '';
-                        $config->updateTime = time();
-                        $config->save();
+                        $ownerWechatIds = $this->normalizeOwnerWechatIds($param['ownerWechatIds'] ?? null, $config);
+                        $groupPushData = $this->prepareGroupPushData($param, $ownerWechatIds, $config);
+                        $groupPushData['updateTime'] = time();
+                        $config->save($groupPushData);
                     }
                     break;
 
@@ -859,7 +901,7 @@ class WorkbenchController extends Controller
                     }
                     break;
                 case self::TYPE_IMPORT_CONTACT: //联系人导入
-                    $config =  WorkbenchImportContact::where('workbenchId', $param['id'])->find();;
+                    $config = WorkbenchImportContact::where('workbenchId', $param['id'])->find();;
                     if ($config) {
                         $config->devices = json_encode($param['deviceGroups']);
                         $config->pools = json_encode($param['poolGroups']);
@@ -897,10 +939,18 @@ class WorkbenchController extends Controller
             return json(['code' => 400, 'msg' => '参数错误']);
         }
 
-        $workbench = Workbench::where([
+
+
+        $where = [
             ['id', '=', $id],
-            ['companyId', '=', $this->request->userInfo['companyId']]
-        ])->find();
+            ['companyId', '=', $this->request->userInfo['companyId']],
+            ['isDel', '=', 0]
+        ];
+        if (empty($this->request->userInfo['isAdmin'])) {
+            $where[] =  ['userId', '=', $this->request->userInfo['id']];
+        }
+
+        $workbench = Workbench::where($where)->find();
 
         if (empty($workbench)) {
             return json(['code' => 404, 'msg' => '工作台不存在']);
@@ -922,11 +972,15 @@ class WorkbenchController extends Controller
             return json(['code' => 400, 'msg' => '参数错误']);
         }
 
-        $workbench = Workbench::where([
+        $where = [
             ['id', '=', $id],
-            ['userId', '=', $this->request->userInfo['id']],
+            ['companyId', '=', $this->request->userInfo['companyId']],
             ['isDel', '=', 0]
-        ])->find();
+        ];
+        if (empty($this->request->userInfo['isAdmin'])) {
+            $where[] =  ['userId', '=', $this->request->userInfo['id']];
+        }
+        $workbench = Workbench::where($where)->find();
 
         if (!$workbench) {
             return json(['code' => 404, 'msg' => '工作台不存在']);
@@ -1029,10 +1083,11 @@ class WorkbenchController extends Controller
                         $newConfig->status = $config->status;
                         $newConfig->groups = $config->groups;
                         $newConfig->friends = $config->friends;
-                        $newConfig->devices = $config->devices;
                         $newConfig->contentLibraries = $config->contentLibraries;
+                        $newConfig->trafficPools = property_exists($config, 'trafficPools') ? $config->trafficPools : json_encode([], JSON_UNESCAPED_UNICODE);
                         $newConfig->socialMediaId = $config->socialMediaId;
                         $newConfig->promotionSiteId = $config->promotionSiteId;
+                        $newConfig->ownerWechatIds = $config->ownerWechatIds;
                         $newConfig->createTime = time();
                         $newConfig->updateTime = time();
                         $newConfig->save();
@@ -1051,15 +1106,15 @@ class WorkbenchController extends Controller
                         $newConfig->maxGroupsPerDay = $config->maxGroupsPerDay;
                         $newConfig->groupNameTemplate = $config->groupNameTemplate;
                         $newConfig->groupDescription = $config->groupDescription;
-                        $newConfig->poolGroups =  $config->poolGroups;
-                        $newConfig->wechatGroups =  $config->wechatGroups;
+                        $newConfig->poolGroups = $config->poolGroups;
+                        $newConfig->wechatGroups = $config->wechatGroups;
                         $newConfig->createTime = time();
                         $newConfig->updateTime = time();
                         $newConfig->save();
                     }
                     break;
                 case self::TYPE_IMPORT_CONTACT: //联系人导入
-                    $config =  WorkbenchImportContact::where('workbenchId',$id)->find();
+                    $config = WorkbenchImportContact::where('workbenchId', $id)->find();
                     if ($config) {
                         $newConfig = new WorkbenchImportContact;
                         $newConfig->workbenchId = $newWorkbench->id;
@@ -1128,10 +1183,10 @@ class WorkbenchController extends Controller
                 ->where(['id' => $item['wechatFriendId']])
                 ->field('nickName,avatar')
                 ->find();
-            if(!empty($friend)){
+            if (!empty($friend)) {
                 $item['friendName'] = $friend['nickName'];
                 $item['friendAvatar'] = $friend['avatar'];
-            }else{
+            } else {
                 $item['friendName'] = '';
                 $item['friendAvatar'] = '';
             }
@@ -1142,10 +1197,10 @@ class WorkbenchController extends Controller
                 ->where(['id' => $item['wechatAccountId']])
                 ->field('nickName,avatar')
                 ->find();
-            if(!empty($friend)){
+            if (!empty($friend)) {
                 $item['operatorName'] = $friend['nickName'];
                 $item['operatorAvatar'] = $friend['avatar'];
-            }else{
+            } else {
                 $item['operatorName'] = '';
                 $item['operatorAvatar'] = '';
             }
@@ -1652,6 +1707,43 @@ class WorkbenchController extends Controller
         return json(['code' => 200, 'msg' => '获取成功', 'data' => ['total' => $total, 'list' => $list]]);
     }
 
+    /**
+     * 获取流量池列表
+     * @return \think\response\Json
+     */
+    public function getTrafficPoolList()
+    {
+        $page = $this->request->param('page', 1);
+        $limit = $this->request->param('limit', 10);
+        $keyword = $this->request->param('keyword', '');
+        $companyId = $this->request->userInfo['companyId'];
+
+        $baseQuery = Db::name('traffic_source_package')->alias('tsp')
+            ->where('tsp.isDel', 0)
+            ->whereIn('tsp.companyId', [$companyId, 0]);
+
+        if (!empty($keyword)) {
+            $baseQuery->whereLike('tsp.name', '%' . $keyword . '%');
+        }
+
+        $total = (clone $baseQuery)->count();
+
+        $list = $baseQuery
+            ->leftJoin('traffic_source_package_item tspi', 'tspi.packageId = tsp.id and tspi.isDel = 0')
+            ->field('tsp.id,tsp.name,tsp.description,tsp.pic,tsp.companyId,COUNT(tspi.id) as itemCount,max(tspi.createTime) as latestImportTime')
+            ->group('tsp.id')
+            ->order('tsp.id', 'desc')
+            ->page($page, $limit)
+            ->select();
+
+        foreach ($list as &$item) {
+            $item['latestImportTime'] = !empty($item['latestImportTime']) ? date('Y-m-d H:i:s', $item['latestImportTime']) : '';
+        }
+        unset($item);
+
+        return json(['code' => 200, 'msg' => '获取成功', 'data' => ['total' => $total, 'list' => $list]]);
+    }
+
 
     public function getAccountList()
     {
@@ -1707,7 +1799,7 @@ class WorkbenchController extends Controller
 
 
     //京东转链-京推推
-    public function changeLink($content = '',$positionid = '')
+    public function changeLink($content = '', $positionid = '')
     {
         $unionId = Env::get('jd.unionId', '');
         $jttAppId = Env::get('jd.jttAppId', '');
@@ -1718,18 +1810,17 @@ class WorkbenchController extends Controller
         $positionid = !empty($positionid) ? $positionid : $this->request->param('positionid', '');
 
 
-
-        if (empty($content)){
-            return json_encode(['code' => 500, 'msg' => '转链的内容为空']) ;
+        if (empty($content)) {
+            return json_encode(['code' => 500, 'msg' => '转链的内容为空']);
         }
-        
+
         // 验证是否包含链接
         if (!$this->containsLink($content)) {
-             return  json_encode(['code' => 500, 'msg' => '内容中未检测到有效链接']) ;
+            return json_encode(['code' => 500, 'msg' => '内容中未检测到有效链接']);
         }
 
-        if(empty($unionId) || empty($jttAppId) || empty($appKey) || empty($apiUrl)){
-            return json_encode(['code' => 500, 'msg' => '参数缺失']) ;
+        if (empty($unionId) || empty($jttAppId) || empty($appKey) || empty($apiUrl)) {
+            return json_encode(['code' => 500, 'msg' => '参数缺失']);
         }
         $params = [
             'unionid' => $unionId,
@@ -1743,21 +1834,20 @@ class WorkbenchController extends Controller
             $params['positionid'] = $positionid;
         }
 
-        $res = requestCurl($apiUrl,$params,'GET',[],'json');
-        $res = json_decode($res,true);
-        if (empty($res)){
-              return json_encode(['code' => 500, 'msg' => '未知错误']) ;
+        $res = requestCurl($apiUrl, $params, 'GET', [], 'json');
+        $res = json_decode($res, true);
+        if (empty($res)) {
+            return json_encode(['code' => 500, 'msg' => '未知错误']);
         }
         $result = $res['result'];
-        if ($res['return'] == 0){
-              return json_encode(['code' => 200,'data' => $result['chain_content'],'msg' => $result['msg']]) ;
-        }else{
-              return json_encode(['code' => 500, 'msg' => $result['msg']]) ;
+        if ($res['return'] == 0) {
+            return json_encode(['code' => 200, 'data' => $result['chain_content'], 'msg' => $result['msg']]);
+        } else {
+            return json_encode(['code' => 500, 'msg' => $result['msg']]);
         }
     }
 
 
-
     public function getTrafficList()
     {
         $companyId = $this->request->userInfo['companyId'];
@@ -1769,24 +1859,24 @@ class WorkbenchController extends Controller
             return json(['code' => 400, 'msg' => '参数错误']);
         }
 
-        $workbench = Db::name('workbench')->where(['id' => $workbenchId,'isDel' => 0,'companyId' => $companyId,'type' => 5])->find();
+        $workbench = Db::name('workbench')->where(['id' => $workbenchId, 'isDel' => 0, 'companyId' => $companyId, 'type' => 5])->find();
 
-        if (empty($workbench)){
+        if (empty($workbench)) {
             return json(['code' => 400, 'msg' => '该任务不存在或已删除']);
         }
         $query = Db::name('workbench_traffic_config_item')->alias('wtc')
-            ->join(['s2_wechat_friend' => 'wf'],'wtc.wechatFriendId = wf.id')
-            ->join('users u','wtc.wechatAccountId = u.s2_accountId','left')
+            ->join(['s2_wechat_friend' => 'wf'], 'wtc.wechatFriendId = wf.id')
+            ->join('users u', 'wtc.wechatAccountId = u.s2_accountId', 'left')
             ->field([
-                'wtc.id','wtc.isRecycle','wtc.isRecycle','wtc.createTime',
-                'wf.wechatId','wf.alias','wf.nickname','wf.avatar','wf.gender','wf.phone',
-                'u.account','u.username'
+                'wtc.id', 'wtc.isRecycle', 'wtc.isRecycle', 'wtc.createTime',
+                'wf.wechatId', 'wf.alias', 'wf.nickname', 'wf.avatar', 'wf.gender', 'wf.phone',
+                'u.account', 'u.username'
             ])
             ->where(['wtc.workbenchId' => $workbenchId])
             ->order('wtc.id DESC');
 
-        if (!empty($keyword)){
-            $query->where('wf.wechatId|wf.alias|wf.nickname|wf.phone|u.account|u.username','like','%' . $keyword . '%');
+        if (!empty($keyword)) {
+            $query->where('wf.wechatId|wf.alias|wf.nickname|wf.phone|u.account|u.username', 'like', '%' . $keyword . '%');
         }
 
         $total = $query->count();
@@ -1798,7 +1888,6 @@ class WorkbenchController extends Controller
         unset($item);
 
 
-
         $data = [
             'total' => $total,
             'list' => $list,
@@ -1808,6 +1897,220 @@ class WorkbenchController extends Controller
 
     }
 
+    /**
+     * 规范化客服微信ID列表
+     * @param mixed $ownerWechatIds
+     * @param WorkbenchGroupPush|null $originalConfig
+     * @return array
+     * @throws \Exception
+     */
+    private function normalizeOwnerWechatIds($ownerWechatIds, WorkbenchGroupPush $originalConfig = null): array
+    {
+        if ($ownerWechatIds === null) {
+            $existing = $originalConfig ? $this->decodeJsonArray($originalConfig->ownerWechatIds ?? []) : [];
+            if (empty($existing)) {
+                throw new \Exception('请至少选择一个客服微信');
+            }
+            return $existing;
+        }
+
+        if (!is_array($ownerWechatIds)) {
+            throw new \Exception('客服参数格式错误');
+        }
+
+        $normalized = $this->extractIdList($ownerWechatIds, '客服参数格式错误');
+        if (empty($normalized)) {
+            throw new \Exception('请至少选择一个客服微信');
+        }
+        return $normalized;
+    }
+
+    /**
+     * 构建群推送配置数据
+     * @param array $param
+     * @param array $ownerWechatIds
+     * @param WorkbenchGroupPush|null $originalConfig
+     * @return array
+     * @throws \Exception
+     */
+    private function prepareGroupPushData(array $param, array $ownerWechatIds, WorkbenchGroupPush $originalConfig = null): array
+    {
+        $targetTypeDefault = $originalConfig ? intval($originalConfig->targetType) : 1;
+        $targetType = intval($this->getParamValue($param, 'targetType', $targetTypeDefault)) ?: 1;
+
+        $groupPushSubTypeDefault = $originalConfig ? intval($originalConfig->groupPushSubType) : 1;
+        $groupPushSubType = intval($this->getParamValue($param, 'groupPushSubType', $groupPushSubTypeDefault)) ?: 1;
+        if (!in_array($groupPushSubType, [1, 2], true)) {
+            $groupPushSubType = 1;
+        }
+
+        $data = [
+            'pushType' => $this->toBoolInt($this->getParamValue($param, 'pushType', $originalConfig->pushType ?? 0)),
+            'targetType' => $targetType,
+            'startTime' => $this->getParamValue($param, 'startTime', $originalConfig->startTime ?? ''),
+            'endTime' => $this->getParamValue($param, 'endTime', $originalConfig->endTime ?? ''),
+            'maxPerDay' => intval($this->getParamValue($param, 'maxPerDay', $originalConfig->maxPerDay ?? 0)),
+            'pushOrder' => $this->getParamValue($param, 'pushOrder', $originalConfig->pushOrder ?? 1),
+            'groupPushSubType' => $groupPushSubType,
+            'status' => $this->toBoolInt($this->getParamValue($param, 'status', $originalConfig->status ?? 0)),
+            'socialMediaId' => $this->getParamValue($param, 'socialMediaId', $originalConfig->socialMediaId ?? ''),
+            'promotionSiteId' => $this->getParamValue($param, 'promotionSiteId', $originalConfig->promotionSiteId ?? ''),
+            'friendIntervalMin' => intval($this->getParamValue($param, 'friendIntervalMin', $originalConfig->friendIntervalMin ?? 10)),
+            'friendIntervalMax' => intval($this->getParamValue($param, 'friendIntervalMax', $originalConfig->friendIntervalMax ?? 20)),
+            'messageIntervalMin' => intval($this->getParamValue($param, 'messageIntervalMin', $originalConfig->messageIntervalMin ?? 1)),
+            'messageIntervalMax' => intval($this->getParamValue($param, 'messageIntervalMax', $originalConfig->messageIntervalMax ?? 12)),
+            'isRandomTemplate' => $this->toBoolInt($this->getParamValue($param, 'isRandomTemplate', $originalConfig->isRandomTemplate ?? 0)),
+            'ownerWechatIds' => json_encode($ownerWechatIds, JSON_UNESCAPED_UNICODE),
+        ];
+
+        if ($data['friendIntervalMin'] > $data['friendIntervalMax']) {
+            throw new \Exception('目标间最小间隔不能大于最大间隔');
+        }
+        if ($data['messageIntervalMin'] > $data['messageIntervalMax']) {
+            throw new \Exception('消息间最小间隔不能大于最大间隔');
+        }
+
+        $contentGroupsExisting = $originalConfig ? $this->decodeJsonArray($originalConfig->contentLibraries ?? []) : [];
+        $contentGroupsParam = $this->getParamValue($param, 'contentGroups', null);
+        $contentGroups = $contentGroupsParam !== null
+            ? $this->extractIdList($contentGroupsParam, '内容库参数格式错误')
+            : $contentGroupsExisting;
+        $data['contentLibraries'] = json_encode($contentGroups, JSON_UNESCAPED_UNICODE);
+
+        $postPushTagsExisting = $originalConfig ? $this->decodeJsonArray($originalConfig->postPushTags ?? []) : [];
+        $postPushTagsParam = $this->getParamValue($param, 'postPushTags', null);
+        $postPushTags = $postPushTagsParam !== null
+            ? $this->extractIdList($postPushTagsParam, '推送标签参数格式错误')
+            : $postPushTagsExisting;
+        $data['postPushTags'] = json_encode($postPushTags, JSON_UNESCAPED_UNICODE);
+
+        if ($targetType === 1) {
+            $data['isLoop'] = $this->toBoolInt($this->getParamValue($param, 'isLoop', $originalConfig->isLoop ?? 0));
+
+            $groupsExisting = $originalConfig ? $this->decodeJsonArray($originalConfig->groups ?? []) : [];
+            $wechatGroups = array_key_exists('wechatGroups', $param)
+                ? $this->extractIdList($param['wechatGroups'], '群参数格式错误')
+                : $groupsExisting;
+            if (empty($wechatGroups)) {
+                throw new \Exception('群推送必须选择微信群');
+            }
+            $data['groups'] = json_encode($wechatGroups, JSON_UNESCAPED_UNICODE);
+            $data['friends'] = json_encode([], JSON_UNESCAPED_UNICODE);
+            $data['trafficPools'] = json_encode([], JSON_UNESCAPED_UNICODE);
+
+            if ($groupPushSubType === 2) {
+                $announcementContent = $this->getParamValue($param, 'announcementContent', $originalConfig->announcementContent ?? '');
+                if (empty($announcementContent)) {
+                    throw new \Exception('群公告必须输入公告内容');
+                }
+                $enableAiRewrite = $this->toBoolInt($this->getParamValue($param, 'enableAiRewrite', $originalConfig->enableAiRewrite ?? 0));
+                $aiRewritePrompt = trim((string)$this->getParamValue($param, 'aiRewritePrompt', $originalConfig->aiRewritePrompt ?? ''));
+                if ($enableAiRewrite === 1 && $aiRewritePrompt === '') {
+                    throw new \Exception('启用AI智能话术改写时，必须输入改写提示词');
+                }
+                $data['announcementContent'] = $announcementContent;
+                $data['enableAiRewrite'] = $enableAiRewrite;
+                $data['aiRewritePrompt'] = $aiRewritePrompt;
+            } else {
+                $data['groupPushSubType'] = 1;
+                $data['announcementContent'] = '';
+                $data['enableAiRewrite'] = 0;
+                $data['aiRewritePrompt'] = '';
+            }
+        } else {
+            $data['isLoop'] = 0;
+            $friendsExisting = $originalConfig ? $this->decodeJsonArray($originalConfig->friends ?? []) : [];
+            $trafficPoolsExisting = $originalConfig ? $this->decodeJsonArray($originalConfig->trafficPools ?? []) : [];
+
+            $friendTargets = array_key_exists('wechatFriends', $param)
+                ? $this->extractIdList($param['wechatFriends'], '好友参数格式错误')
+                : $friendsExisting;
+            $trafficPools = array_key_exists('trafficPools', $param)
+                ? $this->extractIdList($param['trafficPools'], '流量池参数格式错误')
+                : $trafficPoolsExisting;
+
+            if (empty($friendTargets) && empty($trafficPools)) {
+                throw new \Exception('好友推送需至少选择好友或流量池');
+            }
+
+            $data['friends'] = json_encode($friendTargets, JSON_UNESCAPED_UNICODE);
+            $data['trafficPools'] = json_encode($trafficPools, JSON_UNESCAPED_UNICODE);
+            $data['groups'] = json_encode([], JSON_UNESCAPED_UNICODE);
+            $data['groupPushSubType'] = 1;
+            $data['announcementContent'] = '';
+            $data['enableAiRewrite'] = 0;
+            $data['aiRewritePrompt'] = '';
+        }
+
+        return $data;
+    }
+
+    /**
+     * 获取参数值，若不存在则返回默认值
+     * @param array $param
+     * @param string $key
+     * @param mixed $default
+     * @return mixed
+     */
+    private function getParamValue(array $param, string $key, $default)
+    {
+        return array_key_exists($key, $param) ? $param[$key] : $default;
+    }
+
+    /**
+     * 将值转换为整型布尔
+     * @param mixed $value
+     * @return int
+     */
+    private function toBoolInt($value): int
+    {
+        return empty($value) ? 0 : 1;
+    }
+
+    /**
+     * 从参数中提取ID列表
+     * @param mixed $items
+     * @param string $errorMessage
+     * @return array
+     * @throws \Exception
+     */
+    private function extractIdList($items, string $errorMessage = '参数格式错误'): array
+    {
+        if (!is_array($items)) {
+            throw new \Exception($errorMessage);
+        }
+
+        $ids = [];
+        foreach ($items as $item) {
+            if (is_array($item) && isset($item['id'])) {
+                $item = $item['id'];
+            }
+            if ($item === '' || $item === null) {
+                continue;
+            }
+            $ids[] = $item;
+        }
+
+        return array_values(array_unique($ids));
+    }
+
+    /**
+     * 解码JSON数组
+     * @param mixed $value
+     * @return array
+     */
+    private function decodeJsonArray($value): array
+    {
+        if (empty($value)) {
+            return [];
+        }
+        if (is_array($value)) {
+            return $value;
+        }
+        $decoded = json_decode($value, true);
+        return is_array($decoded) ? $decoded : [];
+    }
+
     /**
      * 验证内容是否包含链接
      * @param string $content 要检测的内容
@@ -1838,14 +2141,14 @@ class WorkbenchController extends Controller
             // 通用短链接模式
             '/[a-zA-Z0-9-]+\.[a-zA-Z]{2,}\/[a-zA-Z0-9\-._~:\/?#\[\]@!$&\'()*+,;=]+/i'
         ];
-        
+
         // 遍历所有模式进行匹配
         foreach ($patterns as $pattern) {
             if (preg_match($pattern, $content)) {
                 return true;
             }
         }
-        
+
         return false;
     }
 
@@ -1907,5 +2210,762 @@ class WorkbenchController extends Controller
         ]);
     }
 
+    /**
+     * 获取群发统计数据
+     * @return \think\response\Json
+     */
+    public function getGroupPushStats()
+    {
+        $workbenchId = $this->request->param('workbenchId', 0);
+        $timeRange = $this->request->param('timeRange', '7'); // 默认最近7天
+        $contentLibraryIds = $this->request->param('contentLibraryIds', ''); // 话术组筛选
+        $userId = $this->request->userInfo['id'];
+
+        // 如果指定了工作台ID，则验证权限
+        if (!empty($workbenchId)) {
+            $workbench = Workbench::where([
+                ['id', '=', $workbenchId],
+                ['userId', '=', $userId],
+                ['type', '=', self::TYPE_GROUP_PUSH],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if (empty($workbench)) {
+                return json(['code' => 404, 'msg' => '工作台不存在']);
+            }
+        }
+
+        // 计算时间范围
+        $days = intval($timeRange);
+        $startTime = strtotime(date('Y-m-d 00:00:00', strtotime("-{$days} days")));
+        $endTime = time();
+
+        // 构建查询条件
+        $where = [
+            ['wgpi.createTime', '>=', $startTime],
+            ['wgpi.createTime', '<=', $endTime]
+        ];
+
+        // 如果指定了工作台ID，则限制查询范围
+        if (!empty($workbenchId)) {
+            $where[] = ['wgpi.workbenchId', '=', $workbenchId];
+        } else {
+            // 如果没有指定工作台ID，则查询当前用户的所有群推送工作台
+            $workbenchIds = Workbench::where([
+                ['userId', '=', $userId],
+                ['type', '=', self::TYPE_GROUP_PUSH],
+                ['isDel', '=', 0]
+            ])->column('id');
+            
+            if (empty($workbenchIds)) {
+                // 如果没有工作台，返回空结果
+                $workbenchIds = [-1];
+            }
+            $where[] = ['wgpi.workbenchId', 'in', $workbenchIds];
+        }
+
+        // 话术组筛选 - 先获取符合条件的内容ID列表
+        $contentIds = null;
+        if (!empty($contentLibraryIds)) {
+            $libraryIds = is_array($contentLibraryIds) ? $contentLibraryIds : explode(',', $contentLibraryIds);
+            $libraryIds = array_filter(array_map('intval', $libraryIds));
+            if (!empty($libraryIds)) {
+                // 查询符合条件的内容ID
+                $contentIds = Db::name('content_item')
+                    ->whereIn('libraryId', $libraryIds)
+                    ->column('id');
+                if (empty($contentIds)) {
+                    // 如果没有符合条件的内容，返回空结果
+                    $contentIds = [-1]; // 使用不存在的ID，确保查询结果为空
+                }
+            }
+        }
+
+        // 1. 基础统计：触达率、回复率、平均回复时间、链接点击率
+        $stats = $this->calculateBasicStats($workbenchId, $where, $startTime, $endTime, $contentIds);
+
+        // 2. 话术组对比
+        $contentLibraryComparison = $this->getContentLibraryComparison($workbenchId, $where, $startTime, $endTime, $contentIds);
+
+        // 3. 时段分析
+        $timePeriodAnalysis = $this->getTimePeriodAnalysis($workbenchId, $where, $startTime, $endTime, $contentIds);
+
+        // 4. 互动深度（可选，需要更多数据）
+        $interactionDepth = $this->getInteractionDepth($workbenchId, $where, $startTime, $endTime, $contentIds);
+
+        return json([
+            'code' => 200,
+            'msg' => '获取成功',
+            'data' => [
+                'basicStats' => $stats,
+                'contentLibraryComparison' => $contentLibraryComparison,
+                'timePeriodAnalysis' => $timePeriodAnalysis,
+                'interactionDepth' => $interactionDepth
+            ]
+        ]);
+    }
+
+    /**
+     * 计算基础统计数据
+     */
+    private function calculateBasicStats($workbenchId, $where, $startTime, $endTime, $contentIds = null)
+    {
+        // 获取工作台配置，计算计划发送数
+        // 如果 workbenchId 为空，则查询所有工作台的配置
+        $configQuery = WorkbenchGroupPush::alias('wgp')
+            ->join('workbench w', 'w.id = wgp.workbenchId', 'left')
+            ->where('w.type', self::TYPE_GROUP_PUSH)
+            ->where('w.isDel', 0);
+        
+        if (!empty($workbenchId)) {
+            $configQuery->where('wgp.workbenchId', $workbenchId);
+        } else {
+            // 如果没有指定工作台ID，需要从 where 条件中获取 workbenchId 列表
+            $workbenchIdCondition = null;
+            foreach ($where as $condition) {
+                if (is_array($condition) && isset($condition[0]) && $condition[0] === 'wgpi.workbenchId') {
+                    if ($condition[1] === 'in' && is_array($condition[2])) {
+                        $workbenchIdCondition = $condition[2];
+                        break;
+                    } elseif ($condition[1] === '=') {
+                        $workbenchIdCondition = [$condition[2]];
+                        break;
+                    }
+                }
+            }
+            if ($workbenchIdCondition) {
+                $configQuery->whereIn('wgp.workbenchId', $workbenchIdCondition);
+            }
+        }
+        
+        $configs = $configQuery->select();
+        $targetType = 1; // 默认值
+        if (!empty($configs)) {
+            // 如果只有一个配置，使用它的 targetType；如果有多个，默认使用1
+            $targetType = intval($configs[0]->targetType ?? 1);
+        }
+
+        // 计划发送数（根据配置计算）
+        $plannedSend = 0;
+        if (!empty($configs)) {
+            $days = ceil(($endTime - $startTime) / 86400);
+            foreach ($configs as $config) {
+                $maxPerDay = intval($config->maxPerDay ?? 0);
+                $configTargetType = intval($config->targetType ?? 1);
+                if ($configTargetType == 1) {
+                    // 群推送：计划发送数 = 每日推送次数 * 天数 * 群数量
+                    $groups = $this->decodeJsonArray($config->groups ?? []);
+                    $plannedSend += $maxPerDay * $days * count($groups);
+                } else {
+                    // 好友推送：计划发送数 = 每日推送人数 * 天数
+                    $plannedSend += $maxPerDay * $days;
+                }
+            }
+        }
+
+        // 构建查询条件
+        $queryWhere = $where;
+        if ($contentIds !== null) {
+            $queryWhere[] = ['wgpi.contentId', 'in', $contentIds];
+        }
+
+        // 实际成功发送数（从推送记录表统计）
+        $successSend = Db::name('workbench_group_push_item')
+            ->alias('wgpi')
+            ->where($queryWhere)
+            ->count();
+
+        // 触达率 = 成功发送数 / 计划发送数
+        $reachRate = $plannedSend > 0 ? round(($successSend / $plannedSend) * 100, 1) : 0;
+
+        // 获取发送记录列表，用于查询回复
+        $sentItemIds = Db::name('workbench_group_push_item')
+            ->alias('wgpi')
+            ->where($queryWhere)
+            ->field('wgpi.id, wgpi.groupId, wgpi.friendId, wgpi.wechatAccountId, wgpi.createTime, wgpi.targetType, wgpi.contentId')
+            ->select();
+
+        // 回复统计（通过消息表查询）
+        $replyStats = $this->calculateReplyStats($sentItemIds, $targetType, $startTime, $endTime);
+
+        // 链接点击统计
+        $clickStats = $this->calculateClickStats($sentItemIds, $targetType, $startTime, $endTime);
+
+        // 计算本月对比数据（简化处理，实际应该查询上个月同期数据）
+        $currentMonthStart = strtotime(date('Y-m-01 00:00:00'));
+        $lastMonthStart = strtotime(date('Y-m-01 00:00:00', strtotime('-1 month')));
+        $lastMonthEnd = $currentMonthStart - 1;
+
+        // 获取本月统计数据（避免递归调用）
+        $currentMonthWhere = [
+            ['wgpi.createTime', '>=', $currentMonthStart]
+        ];
+        // 复制 workbenchId 条件
+        foreach ($where as $condition) {
+            if (is_array($condition) && isset($condition[0]) && $condition[0] === 'wgpi.workbenchId') {
+                $currentMonthWhere[] = $condition;
+                break;
+            }
+        }
+        if ($contentIds !== null) {
+            $currentMonthWhere[] = ['wgpi.contentId', 'in', $contentIds];
+        }
+        $currentMonthSend = Db::name('workbench_group_push_item')
+            ->alias('wgpi')
+            ->where($currentMonthWhere)
+            ->count();
+        
+        // 获取本月配置
+        $currentMonthConfigQuery = WorkbenchGroupPush::alias('wgp')
+            ->join('workbench w', 'w.id = wgp.workbenchId', 'left')
+            ->where('w.type', self::TYPE_GROUP_PUSH)
+            ->where('w.isDel', 0);
+        if (!empty($workbenchId)) {
+            $currentMonthConfigQuery->where('wgp.workbenchId', $workbenchId);
+        } else {
+            foreach ($where as $condition) {
+                if (is_array($condition) && isset($condition[0]) && $condition[0] === 'wgpi.workbenchId' && $condition[1] === 'in') {
+                    $currentMonthConfigQuery->whereIn('wgp.workbenchId', $condition[2]);
+                    break;
+                }
+            }
+        }
+        $currentMonthConfigs = $currentMonthConfigQuery->select();
+        $currentMonthPlanned = 0;
+        if (!empty($currentMonthConfigs)) {
+            $currentMonthDays = ceil(($endTime - $currentMonthStart) / 86400);
+            foreach ($currentMonthConfigs as $currentMonthConfig) {
+                $currentMonthMaxPerDay = intval($currentMonthConfig->maxPerDay ?? 0);
+                $currentMonthTargetType = intval($currentMonthConfig->targetType ?? 1);
+                if ($currentMonthTargetType == 1) {
+                    $currentMonthGroups = $this->decodeJsonArray($currentMonthConfig->groups ?? []);
+                    $currentMonthPlanned += $currentMonthMaxPerDay * $currentMonthDays * count($currentMonthGroups);
+                } else {
+                    $currentMonthPlanned += $currentMonthMaxPerDay * $currentMonthDays;
+                }
+            }
+        }
+        $currentMonthReachRate = $currentMonthPlanned > 0 ? round(($currentMonthSend / $currentMonthPlanned) * 100, 1) : 0;
+
+        // 获取上个月统计数据
+        $lastMonthWhere = [
+            ['wgpi.createTime', '>=', $lastMonthStart],
+            ['wgpi.createTime', '<=', $lastMonthEnd]
+        ];
+        // 复制 workbenchId 条件
+        foreach ($where as $condition) {
+            if (is_array($condition) && isset($condition[0]) && $condition[0] === 'wgpi.workbenchId') {
+                $lastMonthWhere[] = $condition;
+                break;
+            }
+        }
+        if ($contentIds !== null) {
+            $lastMonthWhere[] = ['wgpi.contentId', 'in', $contentIds];
+        }
+        $lastMonthSend = Db::name('workbench_group_push_item')
+            ->alias('wgpi')
+            ->where($lastMonthWhere)
+            ->count();
+        
+        // 获取上个月配置
+        $lastMonthConfigQuery = WorkbenchGroupPush::alias('wgp')
+            ->join('workbench w', 'w.id = wgp.workbenchId', 'left')
+            ->where('w.type', self::TYPE_GROUP_PUSH)
+            ->where('w.isDel', 0);
+        if (!empty($workbenchId)) {
+            $lastMonthConfigQuery->where('wgp.workbenchId', $workbenchId);
+        } else {
+            foreach ($where as $condition) {
+                if (is_array($condition) && isset($condition[0]) && $condition[0] === 'wgpi.workbenchId' && $condition[1] === 'in') {
+                    $lastMonthConfigQuery->whereIn('wgp.workbenchId', $condition[2]);
+                    break;
+                }
+            }
+        }
+        $lastMonthConfigs = $lastMonthConfigQuery->select();
+        
+        $lastMonthPlanned = 0;
+        if (!empty($lastMonthConfigs)) {
+            $lastMonthDays = ceil(($lastMonthEnd - $lastMonthStart) / 86400);
+            foreach ($lastMonthConfigs as $lastMonthConfig) {
+                $lastMonthMaxPerDay = intval($lastMonthConfig->maxPerDay ?? 0);
+                $lastMonthTargetType = intval($lastMonthConfig->targetType ?? 1);
+                if ($lastMonthTargetType == 1) {
+                    $lastMonthGroups = $this->decodeJsonArray($lastMonthConfig->groups ?? []);
+                    $lastMonthPlanned += $lastMonthMaxPerDay * $lastMonthDays * count($lastMonthGroups);
+                } else {
+                    $lastMonthPlanned += $lastMonthMaxPerDay * $lastMonthDays;
+                }
+            }
+        }
+        $lastMonthReachRate = $lastMonthPlanned > 0 ? round(($lastMonthSend / $lastMonthPlanned) * 100, 1) : 0;
+
+        // 获取上个月的回复和点击统计（简化处理）
+        $lastMonthSentItems = Db::name('workbench_group_push_item')
+            ->alias('wgpi')
+            ->where($lastMonthWhere)
+            ->field('wgpi.id, wgpi.groupId, wgpi.friendId, wgpi.wechatAccountId, wgpi.createTime, wgpi.targetType, wgpi.contentId')
+            ->select();
+        $lastMonthReplyStats = $this->calculateReplyStats($lastMonthSentItems, $targetType, $lastMonthStart, $lastMonthEnd);
+        $lastMonthClickStats = $this->calculateClickStats($lastMonthSentItems, $targetType, $lastMonthStart, $lastMonthEnd);
+
+        return [
+            'reachRate' => [
+                'value' => $reachRate,
+                'trend' => round($reachRate - $lastMonthReachRate, 1),
+                'unit' => '%',
+                'description' => '成功发送/计划发送'
+            ],
+            'replyRate' => [
+                'value' => $replyStats['replyRate'],
+                'trend' => round($replyStats['replyRate'] - $lastMonthReplyStats['replyRate'], 1),
+                'unit' => '%',
+                'description' => '收到回复/成功发送'
+            ],
+            'avgReplyTime' => [
+                'value' => $replyStats['avgReplyTime'],
+                'trend' => round($lastMonthReplyStats['avgReplyTime'] - $replyStats['avgReplyTime'], 0),
+                'unit' => '分钟',
+                'description' => '从发送到回复的平均时长'
+            ],
+            'clickRate' => [
+                'value' => $clickStats['clickRate'],
+                'trend' => round($clickStats['clickRate'] - $lastMonthClickStats['clickRate'], 1),
+                'unit' => '%',
+                'description' => '点击链接/成功发送'
+            ],
+            'plannedSend' => $plannedSend,
+            'successSend' => $successSend,
+            'replyCount' => $replyStats['replyCount'],
+            'clickCount' => $clickStats['clickCount']
+        ];
+    }
+
+    /**
+     * 计算回复统计
+     */
+    private function calculateReplyStats($sentItems, $targetType, $startTime, $endTime)
+    {
+        if (empty($sentItems)) {
+            return ['replyRate' => 0, 'avgReplyTime' => 0, 'replyCount' => 0];
+        }
+
+        $replyCount = 0;
+        $totalReplyTime = 0;
+        $replyTimes = [];
+
+        foreach ($sentItems as $item) {
+            $itemArray = is_array($item) ? $item : (array)$item;
+            $sendTime = $itemArray['createTime'] ?? 0;
+            $accountId = $itemArray['wechatAccountId'] ?? 0;
+            
+            if ($targetType == 1) {
+                // 群推送：查找群内回复消息
+                $groupId = $itemArray['groupId'] ?? 0;
+                $group = Db::name('wechat_group')->where('id', $groupId)->find();
+                if ($group) {
+                    $replyMsg = Db::table('s2_wechat_message')
+                        ->where('wechatChatroomId', $group['chatroomId'])
+                        ->where('wechatAccountId', $accountId)
+                        ->where('isSend', 0) // 接收的消息
+                        ->where('wechatTime', '>', $sendTime)
+                        ->where('wechatTime', '<=', $sendTime + 86400) // 24小时内回复
+                        ->order('wechatTime', 'asc')
+                        ->find();
+                    
+                    if ($replyMsg) {
+                        $replyCount++;
+                        $replyTime = $replyMsg['wechatTime'] - $sendTime;
+                        $replyTimes[] = $replyTime;
+                        $totalReplyTime += $replyTime;
+                    }
+                }
+            } else {
+                // 好友推送：查找好友回复消息
+                $friendId = $itemArray['friendId'] ?? 0;
+                $friend = Db::table('s2_wechat_friend')->where('id', $friendId)->find();
+                if ($friend) {
+                    $replyMsg = Db::table('s2_wechat_message')
+                        ->where('wechatFriendId', $friendId)
+                        ->where('wechatAccountId', $accountId)
+                        ->where('isSend', 0) // 接收的消息
+                        ->where('wechatTime', '>', $sendTime)
+                        ->where('wechatTime', '<=', $sendTime + 86400) // 24小时内回复
+                        ->order('wechatTime', 'asc')
+                        ->find();
+                    
+                    if ($replyMsg) {
+                        $replyCount++;
+                        $replyTime = $replyMsg['wechatTime'] - $sendTime;
+                        $replyTimes[] = $replyTime;
+                        $totalReplyTime += $replyTime;
+                    }
+                }
+            }
+        }
+
+        $successSend = count($sentItems);
+        $replyRate = $successSend > 0 ? round(($replyCount / $successSend) * 100, 1) : 0;
+        $avgReplyTime = $replyCount > 0 ? round(($totalReplyTime / $replyCount) / 60, 0) : 0; // 转换为分钟
+
+        return [
+            'replyRate' => $replyRate,
+            'avgReplyTime' => $avgReplyTime,
+            'replyCount' => $replyCount
+        ];
+    }
+
+    /**
+     * 计算链接点击统计
+     */
+    private function calculateClickStats($sentItems, $targetType, $startTime, $endTime)
+    {
+        if (empty($sentItems)) {
+            return ['clickRate' => 0, 'clickCount' => 0];
+        }
+
+        $clickCount = 0;
+        $linkContentIds = [];
+
+        // 获取所有发送的内容ID
+        foreach ($sentItems as $item) {
+            $itemArray = is_array($item) ? $item : (array)$item;
+            $contentId = $itemArray['contentId'] ?? 0;
+            if ($contentId > 0) {
+                $linkContentIds[] = $contentId;
+            }
+        }
+
+        if (empty($linkContentIds)) {
+            return ['clickRate' => 0, 'clickCount' => 0];
+        }
+
+        // 查询包含链接的内容
+        $linkContents = Db::name('content_item')
+            ->whereIn('id', array_unique($linkContentIds))
+            ->where('contentType', 2) // 链接类型
+            ->column('id');
+
+        // 统计发送了链接内容的记录数
+        $linkSendCount = 0;
+        foreach ($sentItems as $item) {
+            $itemArray = is_array($item) ? $item : (array)$item;
+            $contentId = $itemArray['contentId'] ?? 0;
+            if (in_array($contentId, $linkContents)) {
+                $linkSendCount++;
+            }
+        }
+
+        // 简化处理：假设点击率基于链接消息的发送（实际应该从点击追踪系统获取）
+        // 这里可以根据业务需求调整，比如通过消息中的链接点击事件统计
+        $clickCount = $linkSendCount; // 简化处理，实际需要真实的点击数据
+
+        $successSend = count($sentItems);
+        $clickRate = $successSend > 0 ? round(($clickCount / $successSend) * 100, 1) : 0;
+
+        return [
+            'clickRate' => $clickRate,
+            'clickCount' => $clickCount
+        ];
+    }
+
+    /**
+     * 获取话术组对比数据
+     */
+    private function getContentLibraryComparison($workbenchId, $where, $startTime, $endTime, $contentIds = null)
+    {
+        $queryWhere = $where;
+        if ($contentIds !== null) {
+            $queryWhere[] = ['wgpi.contentId', 'in', $contentIds];
+        }
+        
+        $comparison = Db::name('workbench_group_push_item')
+            ->alias('wgpi')
+            ->join('content_item ci', 'ci.id = wgpi.contentId', 'left')
+            ->join('content_library cl', 'cl.id = ci.libraryId', 'left')
+            ->where($queryWhere)
+            ->where('cl.id', '<>', null)
+            ->field([
+                'cl.id as libraryId',
+                'cl.name as libraryName',
+                'COUNT(DISTINCT wgpi.id) as pushCount'
+            ])
+            ->group('cl.id, cl.name')
+            ->select();
+
+        $result = [];
+        foreach ($comparison as $item) {
+            $libraryId = $item['libraryId'];
+            $pushCount = intval($item['pushCount']);
+
+            // 获取该内容库的详细统计
+            $libraryContentIds = Db::name('content_item')
+                ->where('libraryId', $libraryId)
+                ->column('id');
+            if (empty($libraryContentIds)) {
+                $libraryContentIds = [-1];
+            }
+            
+            $libraryWhere = array_merge($where, [['wgpi.contentId', 'in', $libraryContentIds]]);
+            $librarySentItems = Db::name('workbench_group_push_item')
+                ->alias('wgpi')
+                ->where($libraryWhere)
+                ->field('wgpi.id, wgpi.groupId, wgpi.friendId, wgpi.wechatAccountId, wgpi.createTime, wgpi.targetType, wgpi.contentId')
+                ->select();
+
+            $config = WorkbenchGroupPush::where('workbenchId', $workbenchId)->find();
+            $targetType = $config ? intval($config->targetType) : 1;
+
+            $replyStats = $this->calculateReplyStats($librarySentItems, $targetType, $startTime, $endTime);
+            $clickStats = $this->calculateClickStats($librarySentItems, $targetType, $startTime, $endTime);
+
+            // 计算转化率（简化处理，实际需要根据业务定义）
+            $conversionRate = $pushCount > 0 ? round(($replyStats['replyCount'] / $pushCount) * 100, 1) : 0;
+
+            $result[] = [
+                'libraryId' => $libraryId,
+                'libraryName' => $item['libraryName'],
+                'pushCount' => $pushCount,
+                'reachRate' => 100, // 简化处理，实际应该计算
+                'replyRate' => $replyStats['replyRate'],
+                'clickRate' => $clickStats['clickRate'],
+                'conversionRate' => $conversionRate,
+                'avgReplyTime' => $replyStats['avgReplyTime'],
+                'level' => $this->getPerformanceLevel($replyStats['replyRate'], $clickStats['clickRate'], $conversionRate)
+            ];
+        }
+
+        // 按回复率排序
+        usort($result, function($a, $b) {
+            return $b['replyRate'] <=> $a['replyRate'];
+        });
+
+        return $result;
+    }
+
+    /**
+     * 获取性能等级
+     */
+    private function getPerformanceLevel($replyRate, $clickRate, $conversionRate)
+    {
+        $score = ($replyRate * 0.4) + ($clickRate * 0.3) + ($conversionRate * 0.3);
+        
+        if ($score >= 40) {
+            return '优秀';
+        } elseif ($score >= 25) {
+            return '良好';
+        } elseif ($score >= 15) {
+            return '一般';
+        } else {
+            return '待提升';
+        }
+    }
+
+    /**
+     * 获取时段分析数据
+     */
+    private function getTimePeriodAnalysis($workbenchId, $where, $startTime, $endTime, $contentIds = null)
+    {
+        $queryWhere = $where;
+        if ($contentIds !== null) {
+            $queryWhere[] = ['wgpi.contentId', 'in', $contentIds];
+        }
+        
+        $analysis = Db::name('workbench_group_push_item')
+            ->alias('wgpi')
+            ->where($queryWhere)
+            ->field([
+                'FROM_UNIXTIME(wgpi.createTime, "%H") as hour',
+                'COUNT(*) as count'
+            ])
+            ->group('hour')
+            ->order('hour', 'asc')
+            ->select();
+
+        $result = [];
+        foreach ($analysis as $item) {
+            $result[] = [
+                'hour' => intval($item['hour']),
+                'count' => intval($item['count'])
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * 获取互动深度数据
+     */
+    private function getInteractionDepth($workbenchId, $where, $startTime, $endTime, $contentIds = null)
+    {
+        // 简化处理，实际需要更复杂的统计逻辑
+        return [
+            'singleReply' => 0, // 单次回复
+            'multipleReply' => 0, // 多次回复
+            'deepInteraction' => 0 // 深度互动
+        ];
+    }
+
+    /**
+     * 获取推送历史记录列表
+     * @return \think\response\Json
+     */
+    public function getGroupPushHistory()
+    {
+        $page = $this->request->param('page', 1);
+        $limit = $this->request->param('limit', 10);
+        $workbenchId = $this->request->param('workbenchId', 0);
+        $keyword = $this->request->param('keyword', '');
+        $userId = $this->request->userInfo['id'];
+
+        // 构建工作台查询条件
+        $workbenchWhere = [
+            ['w.userId', '=', $userId],
+            ['w.type', '=', self::TYPE_GROUP_PUSH],
+            ['w.isDel', '=', 0]
+        ];
+
+        // 如果指定了工作台ID，则验证权限并限制查询范围
+        if (!empty($workbenchId)) {
+            $workbench = Workbench::where([
+                ['id', '=', $workbenchId],
+                ['userId', '=', $userId],
+                ['type', '=', self::TYPE_GROUP_PUSH],
+                ['isDel', '=', 0]
+            ])->find();
+
+            if (empty($workbench)) {
+                return json(['code' => 404, 'msg' => '工作台不存在']);
+            }
+            $workbenchWhere[] = ['w.id', '=', $workbenchId];
+        }
+
+        // 按内容ID、工作台ID和时间分组，统计每次推送
+        $query = Db::name('workbench_group_push_item')
+            ->alias('wgpi')
+            ->join('workbench w', 'w.id = wgpi.workbenchId', 'left')
+            ->join('content_item ci', 'ci.id = wgpi.contentId', 'left')
+            ->join('content_library cl', 'cl.id = ci.libraryId', 'left')
+            ->where($workbenchWhere)
+            ->field([
+                'wgpi.workbenchId',
+                'w.name as workbenchName',
+                'wgpi.contentId',
+                'FROM_UNIXTIME(wgpi.createTime, "%Y-%m-%d %H:00:00") as pushTime',
+                'wgpi.targetType',
+                'MIN(wgpi.createTime) as createTime',
+                'COUNT(DISTINCT wgpi.id) as totalCount',
+                'cl.name as contentLibraryName'
+            ])
+            ->group('wgpi.workbenchId, wgpi.contentId, pushTime, wgpi.targetType');
+
+        if (!empty($keyword)) {
+            $query->where('w.name|cl.name|ci.content', 'like', '%' . $keyword . '%');
+        }
+
+        // 获取分页数据
+        $list = $query->order('createTime', 'desc')
+            ->page($page, $limit)
+            ->select();
+        
+        // 对于有 group by 的查询，统计总数需要重新查询
+        $totalQuery = Db::name('workbench_group_push_item')
+            ->alias('wgpi')
+            ->join('workbench w', 'w.id = wgpi.workbenchId', 'left')
+            ->join('content_item ci', 'ci.id = wgpi.contentId', 'left')
+            ->join('content_library cl', 'cl.id = ci.libraryId', 'left')
+            ->where($workbenchWhere);
+        
+        if (!empty($keyword)) {
+            $totalQuery->where('w.name|cl.name|ci.content', 'like', '%' . $keyword . '%');
+        }
+        
+        // 统计分组后的记录数（使用子查询）
+        $subQuery = $totalQuery
+            ->field([
+                'wgpi.workbenchId',
+                'wgpi.contentId',
+                'FROM_UNIXTIME(wgpi.createTime, "%Y-%m-%d %H:00:00") as pushTime',
+                'wgpi.targetType'
+            ])
+            ->group('wgpi.workbenchId, wgpi.contentId, pushTime, wgpi.targetType')
+            ->buildSql();
+        
+        $total = Db::table('(' . $subQuery . ') as temp')->count();
+
+        // 处理每条记录
+        foreach ($list as &$item) {
+            $itemWorkbenchId = $item['workbenchId'];
+            $contentId = $item['contentId'];
+            $pushTime = $item['pushTime'];
+            $targetType = intval($item['targetType']);
+
+            // 将时间字符串转换为时间戳范围（小时级别）
+            $pushTimeStart = strtotime($pushTime);
+            $pushTimeEnd = $pushTimeStart + 3600; // 一小时后
+
+            // 获取该次推送的详细统计
+            $pushWhere = [
+                ['wgpi.workbenchId', '=', $itemWorkbenchId],
+                ['wgpi.contentId', '=', $contentId],
+                ['wgpi.createTime', '>=', $pushTimeStart],
+                ['wgpi.createTime', '<', $pushTimeEnd],
+                ['wgpi.targetType', '=', $targetType]
+            ];
+
+            // 目标数量
+            if ($targetType == 1) {
+                // 群推送：统计群数量
+                $targetCount = Db::name('workbench_group_push_item')
+                    ->alias('wgpi')
+                    ->where($pushWhere)
+                    ->where('wgpi.groupId', '<>', null)
+                    ->distinct(true)
+                    ->count('wgpi.groupId');
+            } else {
+                // 好友推送：统计好友数量
+                $targetCount = Db::name('workbench_group_push_item')
+                    ->alias('wgpi')
+                    ->where($pushWhere)
+                    ->where('wgpi.friendId', '<>', null)
+                    ->distinct(true)
+                    ->count('wgpi.friendId');
+            }
+
+            // 成功数和失败数（简化处理，实际需要根据发送状态判断）
+            $successCount = intval($item['totalCount']); // 简化处理
+            $failCount = 0; // 简化处理，实际需要从发送状态获取
+
+            // 状态判断
+            $status = $successCount > 0 ? 'success' : 'failed';
+            if ($failCount > 0 && $successCount > 0) {
+                $status = 'partial';
+            }
+
+            $item['pushType'] = $targetType == 1 ? '群推送' : '好友推送';
+            $item['pushTypeCode'] = $targetType;
+            $item['targetCount'] = $targetCount;
+            $item['successCount'] = $successCount;
+            $item['failCount'] = $failCount;
+            $item['status'] = $status;
+            $item['statusText'] = $status == 'success' ? '成功' : ($status == 'partial' ? '部分成功' : '失败');
+            $item['createTime'] = date('Y-m-d H:i:s', $item['createTime']);
+            // 任务名称（工作台名称）
+            $item['taskName'] = $item['workbenchName'] ?? '';
+        }
+        unset($item);
+
+        return json([
+            'code' => 200,
+            'msg' => '获取成功',
+            'data' => [
+                'list' => $list,
+                'total' => $total,
+                'page' => $page,
+                'limit' => $limit
+            ]
+        ]);
+    }
+
 
 }
\ No newline at end of file
diff --git a/Server/application/cunkebao/controller/plan/GetPlanSceneListV1Controller.php b/Server/application/cunkebao/controller/plan/GetPlanSceneListV1Controller.php
index ef71e4c6..cc8c6fbe 100644
--- a/Server/application/cunkebao/controller/plan/GetPlanSceneListV1Controller.php
+++ b/Server/application/cunkebao/controller/plan/GetPlanSceneListV1Controller.php
@@ -38,17 +38,23 @@ class GetPlanSceneListV1Controller extends BaseController
             // 查询数据
             $query = PlansSceneModel::where($where);
             
-            // 获取总数
-            $total = $query->count();
-            
             // 获取分页数据
             $list = $query->order('sort DESC')->select()->toArray();
+
+            if (empty($list)) {
+                return [];
+            }
+
+            $sceneIds = array_column($list, 'id');
+            $companyId = $this->getUserInfo('companyId');
+            $statsMap = $this->buildSceneStats($sceneIds, (int)$companyId);
             
             // 处理数据
             foreach($list as &$val) {
-                $val['scenarioTags'] = json_decode($val['scenarioTags'], true);
-                $val['count'] = $this->getPlanCount($val['id']);
-                $val['growth'] = $this->calculateGrowth($val['id']);
+                $val['scenarioTags'] = json_decode($val['scenarioTags'], true) ?: [];
+                $sceneStats = $statsMap[$val['id']] ?? ['count' => 0, 'growth' => '0%'];
+                $val['count'] = $sceneStats['count'];
+                $val['growth'] = $sceneStats['growth'];
             }
             unset($val);
             
@@ -97,7 +103,7 @@ class GetPlanSceneListV1Controller extends BaseController
                 return ResponseHelper::error('场景不存在');
             }
 
-            $data['scenarioTags'] = json_decode($data['scenarioTags'], true);
+            $data['scenarioTags'] = json_decode($data['scenarioTags'], true) ?: [];
             $data['count'] = $this->getPlanCount($id);
             $data['growth'] = $this->calculateGrowth($id);
             
@@ -130,27 +136,151 @@ class GetPlanSceneListV1Controller extends BaseController
      */
     private function calculateGrowth(int $sceneId): string
     {
-        // 获取本月和上月的计划数量
-        $currentMonth = Db::name('customer_acquisition_task')
-            ->where('sceneId', $sceneId)
-            ->where('status', 1)
-            ->whereTime('createTime', '>=', strtotime(date('Y-m-01')))
-            ->count();
-            
-        $lastMonth = Db::name('customer_acquisition_task')
-            ->where('sceneId', $sceneId)
-            ->where('status', 1)
-            ->whereTime('createTime', 'between', [
-                strtotime(date('Y-m-01', strtotime('-1 month'))),
-                strtotime(date('Y-m-01')) - 1
-            ])
-            ->count();
-            
-        if ($lastMonth == 0) {
-            return $currentMonth > 0 ? '100%' : '0%';
+        $companyId = $this->getUserInfo('companyId');
+        $currentStart = strtotime(date('Y-m-01 00:00:00'));
+        $nextMonthStart = strtotime(date('Y-m-01 00:00:00', strtotime('+1 month')));
+        $lastMonthStart = strtotime(date('Y-m-01 00:00:00', strtotime('-1 month')));
+
+        $currentMonth = $this->getSceneMonthlyCount($sceneId, $companyId, $currentStart, $nextMonthStart - 1);
+        $lastMonth = $this->getSceneMonthlyCount($sceneId, $companyId, $lastMonthStart, $currentStart - 1);
+
+        return $this->formatGrowthPercentage($currentMonth, $lastMonth);
+    }
+
+    /**
+     * 批量构建场景统计数据
+     * @param array $sceneIds
+     * @param int $companyId
+     * @return array
+     */
+    private function buildSceneStats(array $sceneIds, int $companyId): array
+    {
+        if (empty($sceneIds)) {
+            return [];
         }
-        
-        $growth = round(($currentMonth - $lastMonth) / $lastMonth * 100, 2);
+
+        $totalCounts = $this->getSceneTaskCounts($sceneIds, $companyId);
+
+        $currentStart = strtotime(date('Y-m-01 00:00:00'));
+        $nextMonthStart = strtotime(date('Y-m-01 00:00:00', strtotime('+1 month')));
+        $lastMonthStart = strtotime(date('Y-m-01 00:00:00', strtotime('-1 month')));
+
+        $currentMonthCounts = $this->getSceneMonthlyCounts($sceneIds, $companyId, $currentStart, $nextMonthStart - 1);
+        $lastMonthCounts = $this->getSceneMonthlyCounts($sceneIds, $companyId, $lastMonthStart, $currentStart - 1);
+
+        $stats = [];
+        foreach ($sceneIds as $sceneId) {
+            $current = $currentMonthCounts[$sceneId] ?? 0;
+            $last = $lastMonthCounts[$sceneId] ?? 0;
+            $stats[$sceneId] = [
+                'count' => $totalCounts[$sceneId] ?? 0,
+                'growth' => $this->formatGrowthPercentage($current, $last),
+            ];
+        }
+
+        return $stats;
+    }
+
+    /**
+     * 获取场景计划总数
+     * @param array $sceneIds
+     * @param int $companyId
+     * @return array
+     */
+    private function getSceneTaskCounts(array $sceneIds, int $companyId): array
+    {
+        if (empty($sceneIds)) {
+            return [];
+        }
+
+        $rows = Db::name('customer_acquisition_task')
+            ->whereIn('sceneId', $sceneIds)
+            ->where('companyId', $companyId)
+            ->where('deleteTime', 0)
+            ->field('sceneId, COUNT(*) as total')
+            ->group('sceneId')
+            ->select();
+
+        $result = [];
+        foreach ($rows as $row) {
+            $sceneId = is_array($row) ? ($row['sceneId'] ?? 0) : ($row->sceneId ?? 0);
+            if (!$sceneId) {
+                continue;
+            }
+            $result[$sceneId] = (int)(is_array($row) ? ($row['total'] ?? 0) : ($row->total ?? 0));
+        }
+
+        return $result;
+    }
+
+    /**
+     * 获取场景月度数据
+     * @param array $sceneIds
+     * @param int $companyId
+     * @param int $startTime
+     * @param int $endTime
+     * @return array
+     */
+    private function getSceneMonthlyCounts(array $sceneIds, int $companyId, int $startTime, int $endTime): array
+    {
+        if (empty($sceneIds)) {
+            return [];
+        }
+
+        $rows = Db::name('customer_acquisition_task')
+            ->whereIn('sceneId', $sceneIds)
+            ->where('companyId', $companyId)
+            ->where('status', 1)
+            ->where('deleteTime', 0)
+            ->whereBetween('createTime', [$startTime, $endTime])
+            ->field('sceneId, COUNT(*) as total')
+            ->group('sceneId')
+            ->select();
+
+        $result = [];
+        foreach ($rows as $row) {
+            $sceneId = is_array($row) ? ($row['sceneId'] ?? 0) : ($row->sceneId ?? 0);
+            if (!$sceneId) {
+                continue;
+            }
+            $result[$sceneId] = (int)(is_array($row) ? ($row['total'] ?? 0) : ($row->total ?? 0));
+        }
+
+        return $result;
+    }
+
+    /**
+     * 获取单个场景的月度数据
+     * @param int $sceneId
+     * @param int $companyId
+     * @param int $startTime
+     * @param int $endTime
+     * @return int
+     */
+    private function getSceneMonthlyCount(int $sceneId, int $companyId, int $startTime, int $endTime): int
+    {
+        return Db::name('customer_acquisition_task')
+            ->where('sceneId', $sceneId)
+            ->where('companyId', $companyId)
+            ->where('status', 1)
+            ->where('deleteTime', 0)
+            ->whereBetween('createTime', [$startTime, $endTime])
+            ->count();
+    }
+
+    /**
+     * 计算增长百分比
+     * @param int $current
+     * @param int $last
+     * @return string
+     */
+    private function formatGrowthPercentage(int $current, int $last): string
+    {
+        if ($last == 0) {
+            return $current > 0 ? '100%' : '0%';
+        }
+
+        $growth = round(($current - $last) / $last * 100, 2);
         return $growth . '%';
     }
 } 
\ No newline at end of file
diff --git a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php
index c71643ee..75d1d01e 100644
--- a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php
+++ b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php
@@ -50,29 +50,35 @@ class PlanSceneV1Controller extends BaseController
                 ->page($page, $limit)
                 ->select();
 
+            if (!empty($list)) {
+                $taskIds = array_column($list, 'id');
+                $statsMap = $this->buildTaskStats($taskIds);
+
                 foreach($list as &$val){
-                    $val['createTime'] = date('Y-m-d H:i:s', $val['createTime']);
-                    $val['updateTime'] = date('Y-m-d H:i:s', $val['updateTime']);
-                    $val['sceneConf'] = json_decode($val['sceneConf'],true);
-                    $val['reqConf'] = json_decode($val['reqConf'],true);
-                    $val['msgConf'] = json_decode($val['msgConf'],true);
-                    $val['tagConf'] = json_decode($val['tagConf'],true);
-
-                    $val['acquiredCount'] = Db::name('task_customer')->where('task_id',$val['id'])->count();
-                    $val['addedCount'] = Db::name('task_customer')->where('task_id',$val['id'])->whereIn('status',[1,2,3,4])->count();
-                    $val['passCount'] = Db::name('task_customer')->where('task_id',$val['id'])->where('status',4)->count();
-                    $val['passRate'] = 0;
-                    if(!empty($val['passCount']) && !empty($val['addedCount'])){
-                        $passRate = ($val['passCount'] / $val['addedCount']) * 100;
-                        $val['passRate'] = number_format($passRate,2);
-                    }
-
-                    $lastTime = Db::name('task_customer')->where(['task_id'=>$val['id']])->max('updateTime');
-                    $val['lastUpdated'] = !empty($lastTime) ? date('Y-m-d H:i', $lastTime) : '--';
+                    $val['createTime'] = !empty($val['createTime']) ? date('Y-m-d H:i:s', $val['createTime']) : '';
+                    $val['updateTime'] = !empty($val['updateTime']) ? date('Y-m-d H:i:s', $val['updateTime']) : '';
+                    $val['sceneConf'] = json_decode($val['sceneConf'],true) ?: [];
+                    $val['reqConf'] = json_decode($val['reqConf'],true) ?: [];
+                    $val['msgConf'] = json_decode($val['msgConf'],true) ?: [];
+                    $val['tagConf'] = json_decode($val['tagConf'],true) ?: [];
 
+                    $stats = $statsMap[$val['id']] ?? [
+                        'acquiredCount' => 0,
+                        'addedCount' => 0,
+                        'passCount' => 0,
+                        'lastUpdated' => 0
+                    ];
 
+                    $val['acquiredCount'] = $stats['acquiredCount'];
+                    $val['addedCount'] = $stats['addedCount'];
+                    $val['passCount'] = $stats['passCount'];
+                    $val['passRate'] = ($stats['addedCount'] > 0 && $stats['passCount'] > 0)
+                        ? number_format(($stats['passCount'] / $stats['addedCount']) * 100, 2)
+                        : 0;
+                    $val['lastUpdated'] = !empty($stats['lastUpdated']) ? date('Y-m-d H:i', $stats['lastUpdated']) : '--';
                 }
                 unset($val);
+            }
             return ResponseHelper::success([
                 'total' => $total,
                 'list' => $list
@@ -383,6 +389,46 @@ class PlanSceneV1Controller extends BaseController
         ];
     }
 
+    /**
+     * 构建任务统计
+     * @param array $taskIds
+     * @return array
+     */
+    private function buildTaskStats(array $taskIds): array
+    {
+        if (empty($taskIds)) {
+            return [];
+        }
+
+        $rows = Db::name('task_customer')
+            ->whereIn('task_id', $taskIds)
+            ->field([
+                'task_id as taskId',
+                'COUNT(1) as acquiredCount',
+                "SUM(CASE WHEN status IN (1,2,3,4) THEN 1 ELSE 0 END) as addedCount",
+                "SUM(CASE WHEN status = 4 THEN 1 ELSE 0 END) as passCount",
+                'MAX(updateTime) as lastUpdated'
+            ])
+            ->group('task_id')
+            ->select();
+
+        $stats = [];
+        foreach ($rows as $row) {
+            $taskId = is_array($row) ? ($row['taskId'] ?? 0) : ($row->taskId ?? 0);
+            if (!$taskId) {
+                continue;
+            }
+            $stats[$taskId] = [
+                'acquiredCount' => (int)(is_array($row) ? ($row['acquiredCount'] ?? 0) : ($row->acquiredCount ?? 0)),
+                'addedCount' => (int)(is_array($row) ? ($row['addedCount'] ?? 0) : ($row->addedCount ?? 0)),
+                'passCount' => (int)(is_array($row) ? ($row['passCount'] ?? 0) : ($row->passCount ?? 0)),
+                'lastUpdated' => (int)(is_array($row) ? ($row['lastUpdated'] ?? 0) : ($row->lastUpdated ?? 0)),
+            ];
+        }
+
+        return $stats;
+    }
+
 
     /**
      * 获取微信小程序码
diff --git a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php
index dd1539a4..485e30f5 100644
--- a/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php
+++ b/Server/application/cunkebao/controller/plan/PosterWeChatMiniProgram.php
@@ -148,11 +148,11 @@ class PosterWeChatMiniProgram extends Controller
     {
 
         $taskId = request()->param('id');
-        $phoneData = request()->param('phone');
-        if (!$phoneData) {
+        $rawInput = trim((string)request()->param('phone', ''));
+        if ($rawInput === '') {
             return json([
                 'code' => 400,
-                'message' => '手机号不能为空'
+                'message' => '手机号或微信号不能为空'
             ]);
         }
         $task = Db::name('customer_acquisition_task')->where('id', $taskId)->find();
@@ -165,31 +165,69 @@ class PosterWeChatMiniProgram extends Controller
         }
 
 
-        $phoneData = explode("\n",  $phoneData);
-        foreach ($phoneData as $phone) {
-            if (empty($phone)) {
+        $lines = preg_split('/\r\n|\r|\n/', $rawInput);
+        foreach ($lines as $line) {
+            $line = trim($line);
+            if ($line === '') {
                 continue;
             }
-            $trafficPool = Db::name('traffic_pool')->where('identifier', $phone)->find();
+            $parts = array_map('trim', explode(',', $line, 2));
+            $identifier = $parts[0] ?? '';
+            $remark = $parts[1] ?? '';
+            if ($identifier === '') {
+                continue;
+            }
+            $isPhone = preg_match('/^\+?\d{6,}$/', $identifier);
+            $trafficPool = Db::name('traffic_pool')->where('identifier', $identifier)->find();
             if (!$trafficPool) {
-                Db::name('traffic_pool')->insert([
-                    'identifier' => $phone,
-                    'mobile' => $phone,
+                $insertData = [
+                    'identifier' => $identifier,
                     'createTime' => time()
-                ]);
+                ];
+                if ($isPhone) {
+                    $insertData['mobile'] = $identifier;
+                } else {
+                    $insertData['wechatId'] = $identifier;
+                }
+                Db::name('traffic_pool')->insert($insertData);
+            } else {
+                $updates = [];
+                if ($isPhone && empty($trafficPool['mobile'])) {
+                    $updates['mobile'] = $identifier;
+                }
+                if (!$isPhone && empty($trafficPool['wechatId'])) {
+                    $updates['wechatId'] = $identifier;
+                }
+                if (!empty($updates)) {
+                    $updates['updateTime'] = time();
+                    Db::name('traffic_pool')->where('id', $trafficPool['id'])->update($updates);
+                }
             }
 
-            $taskCustomer = Db::name('task_customer')->where('task_id', $taskId)->where('phone', $phone)->find();
+            $taskCustomer = Db::name('task_customer')
+                ->where('task_id', $taskId)
+                ->where('phone', $identifier)
+                ->find();
             if (empty($taskCustomer)) {
-                Db::name('task_customer')->insert([
+                $insertCustomer = [
                     'task_id' => $taskId,
-                    // 'identifier' => $phone,
-                    'phone' => $phone,
+                    'phone' => $identifier,
                     'source' => $task['name'],
                     'createTime' => time(),
                     'tags' => json_encode([]),
                     'siteTags' => json_encode([]),
-                ]);
+                ];
+                if ($remark !== '') {
+                    $insertCustomer['remark'] = $remark;
+                }
+                Db::name('task_customer')->insert($insertCustomer);
+            } elseif ($remark !== '' && $taskCustomer['remark'] !== $remark) {
+                Db::name('task_customer')
+                    ->where('id', $taskCustomer['id'])
+                    ->update([
+                        'remark' => $remark,
+                        'updateTime' => time()
+                    ]);
             }
 
         }
diff --git a/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php b/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php
index 05ac93ca..177d67a6 100644
--- a/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php
+++ b/Server/application/cunkebao/controller/wechat/GetWechatsOnDevicesV1Controller.php
@@ -19,92 +19,6 @@ use think\Db;
  */
 class GetWechatsOnDevicesV1Controller extends BaseController
 {
-    /**
-     * 计算今日可添加好友数量
-     *
-     * @param string $wechatId
-     * @return int
-     */
-    protected function getCanAddFriendCount(string $wechatId): int
-    {
-        $weight = (string)WechatCustomerModel::where(
-            [
-                'wechatId'  => $wechatId,
-                'companyId' => $this->getUserInfo('companyId')
-            ]
-        )
-            ->value('weight');
-
-        return json_decode($weight)->addLimit ?? 0;
-    }
-
-    /**
-     * 计算今日新增好友数量
-     *
-     * @param string $ownerWechatId
-     * @return int
-     */
-    protected function getTodayNewFriendCount(string $ownerWechatId): int
-    {
-        return WechatFriendShipModel::where(compact('ownerWechatId'))
-            ->whereBetween('createTime',
-                [
-                    strtotime(date('Y-m-d 00:00:00')),
-                    strtotime(date('Y-m-d 23:59:59'))
-                ]
-            )
-            ->count('*');
-    }
-
-    /**
-     * TODO 获取微信加友状态
-     *
-     * @param string $wechatId
-     * @return int
-     */
-    protected function getWechatAddFriendStatus(string $wechatId): int
-    {
-        return  Db::name('device_wechat_login')->where(['wechatId' => $wechatId])->order('id DESC')->value('alive');
-    }
-
-    /**
-     * 获取微信好友数量
-     *
-     * @param string $ownerWechatId
-     * @return int
-     */
-    protected function getFriendsCount(string $ownerWechatId): int
-    {
-        return WechatFriendShipModel::where(
-            [
-                'ownerWechatId' => $ownerWechatId,
-                //'companyId'     => $this->getUserInfo('companyId'),
-            ]
-        )
-            ->count();
-    }
-
-    /**
-     * 获取微信所属设备
-     *
-     * @param string $wechatId
-     * @return string
-     */
-    protected function getWhereOnDevice(string $wechatId): string
-    {
-        return (string)DeviceModel::alias('d')
-            ->where(
-                [
-                    'l.wechatId' => $wechatId,
-                    'l.alive'    => DeviceWechatLoginModel::ALIVE_WECHAT_ACTIVE,
-                    'l.companyId' => $this->getUserInfo('companyId')
-                ]
-            )
-            ->join('device_wechat_login l', 'd.id = l.deviceId AND l.companyId = '. $this->getUserInfo('companyId'))
-            ->order('l.id desc')
-            ->value('d.memo');
-    }
-
     /**
      * 主操盘手获取项目下所有设备的id
      *
@@ -172,22 +86,6 @@ class GetWechatsOnDevicesV1Controller extends BaseController
             ->column('wechatId');
     }
 
-    /**
-     * TODO 获取设备最新活跃时间
-     *
-     * @param string $wechatId
-     * @return string
-     */
-    protected function getLatestActiveTime(string $wechatId): string
-    {
-        $wechatAccountId = Db::table('s2_wechat_account')->where(['wechatId' => $wechatId])->value('id');
-        if (empty($wechatAccountId)){
-            return '-';
-        }
-        $time = Db::table('s2_wechat_message')->where('wechatAccountId',$wechatAccountId)->order('id DESC')->value('wechatTime');
-        return !empty($time) ? date('Y-m-d H:i:s', $time) : '-';
-    }
-
     /**
      * 构建查询条件
      *
@@ -256,15 +154,26 @@ class GetWechatsOnDevicesV1Controller extends BaseController
     protected function makeResultedSet(\think\Paginator $result): array
     {
         $resultSets = [];
+        $items = $result->items();
 
-        foreach ($result->items() as $item) {
+        if (empty($items)) {
+            return $resultSets;
+        }
+
+        $wechatIds = array_values(array_unique(array_map(function ($item) {
+            return $item->wechatId ?? ($item['wechatId'] ?? '');
+        }, $items)));
+
+        $metrics = $this->collectWechatMetrics($wechatIds);
+
+        foreach ($items as $item) {
             $sections = $item->toArray() + [
-                    'times'        => $this->getCanAddFriendCount($item->wechatId),
-                    'addedCount'   => $this->getTodayNewFriendCount($item->wechatId),
-                    'wechatStatus' => $this->getWechatAddFriendStatus($item->wechatId),
-                    'totalFriend'  => $this->getFriendsCount($item->wechatId),
-                    'deviceMemo'   => $this->getWhereOnDevice($item->wechatId),
-                    'activeTime'   => $this->getLatestActiveTime($item->wechatId),
+                    'times'        => $metrics['addLimit'][$item->wechatId] ?? 0,
+                    'addedCount'   => $metrics['todayAdded'][$item->wechatId] ?? 0,
+                    'wechatStatus' => $metrics['wechatStatus'][$item->wechatId] ?? 0,
+                    'totalFriend'  => $metrics['totalFriend'][$item->wechatId] ?? 0,
+                    'deviceMemo'   => $metrics['deviceMemo'][$item->wechatId] ?? '',
+                    'activeTime'   => $metrics['activeTime'][$item->wechatId] ?? '-',
                 ];
 
             array_push($resultSets, $sections);
@@ -273,6 +182,109 @@ class GetWechatsOnDevicesV1Controller extends BaseController
         return $resultSets;
     }
 
+    /**
+     * 批量收集微信账号的统计信息
+     * @param array $wechatIds
+     * @return array
+     */
+    protected function collectWechatMetrics(array $wechatIds): array
+    {
+        $metrics = [
+            'addLimit' => [],
+            'todayAdded' => [],
+            'totalFriend' => [],
+            'wechatStatus' => [],
+            'deviceMemo' => [],
+            'activeTime' => [],
+        ];
+
+        if (empty($wechatIds)) {
+            return $metrics;
+        }
+
+        $companyId = $this->getUserInfo('companyId');
+
+        // 可添加好友额度
+        $weightRows = WechatCustomerModel::where('companyId', $companyId)
+            ->whereIn('wechatId', $wechatIds)
+            ->column('weight', 'wechatId');
+        foreach ($weightRows as $wechatId => $weight) {
+            $decoded = json_decode($weight, true);
+            $metrics['addLimit'][$wechatId] = $decoded['addLimit'] ?? 0;
+        }
+
+        // 今日新增好友
+        $start = strtotime(date('Y-m-d 00:00:00'));
+        $end = strtotime(date('Y-m-d 23:59:59'));
+        $todayRows = WechatFriendShipModel::whereIn('ownerWechatId', $wechatIds)
+            ->whereBetween('createTime', [$start, $end])
+            ->field('ownerWechatId, COUNT(*) as total')
+            ->group('ownerWechatId')
+            ->select();
+        foreach ($todayRows as $row) {
+            $wechatId = is_array($row) ? ($row['ownerWechatId'] ?? '') : ($row->ownerWechatId ?? '');
+            if ($wechatId) {
+                $metrics['todayAdded'][$wechatId] = (int)(is_array($row) ? ($row['total'] ?? 0) : ($row->total ?? 0));
+            }
+        }
+
+        // 总好友
+        $friendRows = WechatFriendShipModel::whereIn('ownerWechatId', $wechatIds)
+            ->field('ownerWechatId, COUNT(*) as total')
+            ->group('ownerWechatId')
+            ->select();
+        foreach ($friendRows as $row) {
+            $wechatId = is_array($row) ? ($row['ownerWechatId'] ?? '') : ($row->ownerWechatId ?? '');
+            if ($wechatId) {
+                $metrics['totalFriend'][$wechatId] = (int)(is_array($row) ? ($row['total'] ?? 0) : ($row->total ?? 0));
+            }
+        }
+
+        // 设备状态与备注
+        $loginRows = Db::name('device_wechat_login')
+            ->alias('l')
+            ->leftJoin('device d', 'd.id = l.deviceId')
+            ->field('l.wechatId,l.alive,d.memo')
+            ->where('l.companyId', $companyId)
+            ->whereIn('l.wechatId', $wechatIds)
+            ->order('l.id', 'desc')
+            ->select();
+        foreach ($loginRows as $row) {
+            $wechatId = is_array($row) ? ($row['wechatId'] ?? '') : ($row->wechatId ?? '');
+            if (empty($wechatId) || isset($metrics['wechatStatus'][$wechatId])) {
+                continue;
+            }
+            $metrics['wechatStatus'][$wechatId] = (int)(is_array($row) ? ($row['alive'] ?? 0) : ($row->alive ?? 0));
+            $metrics['deviceMemo'][$wechatId] = is_array($row) ? ($row['memo'] ?? '') : ($row->memo ?? '');
+        }
+
+        // 活跃时间
+        $accountMap = Db::table('s2_wechat_account')
+            ->whereIn('wechatId', $wechatIds)
+            ->column('id', 'wechatId');
+        if (!empty($accountMap)) {
+            $accountRows = Db::table('s2_wechat_message')
+                ->whereIn('wechatAccountId', array_values($accountMap))
+                ->field('wechatAccountId, MAX(wechatTime) as lastTime')
+                ->group('wechatAccountId')
+                ->select();
+            $accountLastTime = [];
+            foreach ($accountRows as $row) {
+                $accountId = is_array($row) ? ($row['wechatAccountId'] ?? 0) : ($row->wechatAccountId ?? 0);
+                if ($accountId) {
+                    $accountLastTime[$accountId] = (int)(is_array($row) ? ($row['lastTime'] ?? 0) : ($row->lastTime ?? 0));
+                }
+            }
+            foreach ($accountMap as $wechatId => $accountId) {
+                if (isset($accountLastTime[$accountId]) && $accountLastTime[$accountId] > 0) {
+                    $metrics['activeTime'][$wechatId] = date('Y-m-d H:i:s', $accountLastTime[$accountId]);
+                }
+            }
+        }
+
+        return $metrics;
+    }
+
     /**
      * 获取在线微信账号列表
      *
diff --git a/Server/application/cunkebao/controller/wechat/PostTransferFriends.php b/Server/application/cunkebao/controller/wechat/PostTransferFriends.php
index 2b1106a8..1839231a 100644
--- a/Server/application/cunkebao/controller/wechat/PostTransferFriends.php
+++ b/Server/application/cunkebao/controller/wechat/PostTransferFriends.php
@@ -69,7 +69,8 @@ class PostTransferFriends extends BaseController
                 'greeting' => '您好，我是'. $wechat['nickname'] .'的辅助客服，请通过'
             ];
 
-            $createAddFriendPlan = new PostCreateAddFriendPlanV1Controller();
+            // 使用容器获取控制器实例，而不是直接实例化
+            $createAddFriendPlan = app('app\cunkebao\controller\plan\PostCreateAddFriendPlanV1Controller');
 
             $taskId = Db::name('customer_acquisition_task')->insertGetId([
                 'name' => '迁移好友（'. $wechat['nickname'] .'）',
diff --git a/Server/application/cunkebao/validate/Workbench.php b/Server/application/cunkebao/validate/Workbench.php
index 89b8c3bb..7225c5a5 100644
--- a/Server/application/cunkebao/validate/Workbench.php
+++ b/Server/application/cunkebao/validate/Workbench.php
@@ -39,16 +39,19 @@ class Workbench extends Validate
         // 群消息推送特有参数
         'pushType' => 'requireIf:type,3|in:0,1', // 推送方式 0定时 1立即
         'targetType' => 'requireIf:type,3|in:1,2', // 推送目标类型：1=群推送，2=好友推送
-        'startTime' => 'requireIf:type,3|dateFormat:H:i',
-        'endTime' => 'requireIf:type,3|dateFormat:H:i',
+        'groupPushSubType' => 'checkGroupPushSubType|in:1,2', // 群推送子类型：1=群群发，2=群公告（仅当targetType=1时有效）
         'maxPerDay' => 'requireIf:type,3|number|min:1',
         'pushOrder' => 'requireIf:type,3|in:1,2', // 1最早 2最新
         'isLoop' => 'requireIf:type,3|in:0,1',
         'status' => 'requireIf:type,3|in:0,1',
         'wechatGroups' => 'checkGroupPushTarget|array|min:1', // 当targetType=1时必填
         'wechatFriends' => 'checkFriendPushTarget|array', // 当targetType=2时可选（可以为空）
-        'deviceGroups' => 'checkFriendPushDevice|array|min:1', // 当targetType=2时必填
+        'ownerWechatId' => 'checkFriendPushService', // 当targetType=2且未选择好友/流量池时必填
         'contentGroups' => 'requireIf:type,3|array|min:1',
+        // 群公告特有参数
+        'announcementContent' => 'checkAnnouncementContent|max:5000', // 群公告内容（当groupPushSubType=2时必填）
+        'enableAiRewrite' => 'checkEnableAiRewrite|in:0,1', // 是否启用AI智能话术改写
+        'aiRewritePrompt' => 'checkAiRewritePrompt|max:500', // AI改写提示词（当enableAiRewrite=1时必填）
         // 自动建群特有参数
         'groupNameTemplate' => 'requireIf:type,4|max:50',
         'maxGroupsPerDay' => 'requireIf:type,4|number|min:1',
@@ -61,6 +64,7 @@ class Workbench extends Validate
         'accountGroups' => 'requireIf:type,5|array|min:1',
          // 通用参数
          'deviceGroups' => 'requireIf:type,1,2,5|array',
+        'trafficPools' => 'checkFriendPushPools',
     ];
 
     /**
@@ -123,13 +127,20 @@ class Workbench extends Validate
         'wechatGroups.checkGroupPushTarget' => '群推送时必须选择推送群组',
         'wechatGroups.array' => '推送群组格式错误',
         'wechatGroups.min' => '至少选择一个推送群组',
+        'groupPushSubType.checkGroupPushSubType' => '群推送子类型错误',
+        'groupPushSubType.in' => '群推送子类型只能是群群发或群公告',
+        'announcementContent.checkAnnouncementContent' => '群公告必须输入公告内容',
+        'announcementContent.max' => '公告内容最多5000个字符',
+        'enableAiRewrite.checkEnableAiRewrite' => 'AI智能话术改写参数错误',
+        'enableAiRewrite.in' => 'AI智能话术改写参数只能是0或1',
+        'aiRewritePrompt.checkAiRewritePrompt' => '启用AI智能话术改写时，必须输入改写提示词',
+        'aiRewritePrompt.max' => '改写提示词最多500个字符',
         'wechatFriends.requireIf' => '请选择推送好友',
         'wechatFriends.checkFriendPushTarget' => '好友推送时必须选择推送好友',
         'wechatFriends.array' => '推送好友格式错误',
         'deviceGroups.requireIf' => '请选择设备',
-        'deviceGroups.checkFriendPushDevice' => '好友推送时必须选择设备',
         'deviceGroups.array' => '设备格式错误',
-        'deviceGroups.min' => '至少选择一个设备',
+        'ownerWechatId.checkFriendPushService' => '好友推送需选择客服或提供好友/流量池',
         // 自动建群相关提示
         'groupNameTemplate.requireIf' => '请设置群名称前缀',
         'groupNameTemplate.max' => '群名称前缀最多50个字符',
@@ -160,6 +171,7 @@ class Workbench extends Validate
         'accountGroups.requireIf' => '流量分发时必须选择分发账号',
         'accountGroups.array' => '分发账号格式错误',
         'accountGroups.min' => '至少选择一个分发账号',
+        'trafficPools.checkFriendPushPools' => '好友推送时请选择好友或流量池',
     ];
 
     /**
@@ -169,7 +181,8 @@ class Workbench extends Validate
         'create' => ['name', 'type', 'autoStart', 'deviceGroups', 'targetGroups',
             'interval', 'maxLikes', 'startTime', 'endTime', 'contentTypes',
             'syncCount', 'syncType', 'accountGroups',
-            'pushType', 'targetType', 'startTime', 'endTime', 'maxPerDay', 'pushOrder', 'isLoop', 'status', 'wechatGroups', 'wechatFriends', 'contentGroups',
+            'pushType', 'targetType', 'groupPushSubType', 'startTime', 'endTime', 'maxPerDay', 'pushOrder', 'isLoop', 'status', 'wechatGroups', 'wechatFriends', 'trafficPools', 'ownerWechatId', 'contentGroups',
+            'announcementContent', 'enableAiRewrite', 'aiRewritePrompt',
             'groupNameTemplate', 'maxGroupsPerDay', 'groupSizeMin', 'groupSizeMax',
             'distributeType', 'timeType', 'accountGroups',
         ],
@@ -177,7 +190,8 @@ class Workbench extends Validate
         'update' => ['name', 'type', 'autoStart', 'deviceGroups', 'targetGroups',
             'interval', 'maxLikes', 'startTime', 'endTime', 'contentTypes',
             'syncCount', 'syncType', 'accountGroups',
-            'pushType', 'targetType', 'startTime', 'endTime', 'maxPerDay', 'pushOrder', 'isLoop', 'status', 'wechatGroups', 'wechatFriends', 'deviceGroups', 'contentGroups',
+            'pushType', 'targetType', 'groupPushSubType', 'startTime', 'endTime', 'maxPerDay', 'pushOrder', 'isLoop', 'status', 'wechatGroups', 'wechatFriends', 'trafficPools', 'ownerWechatId', 'contentGroups',
+            'announcementContent', 'enableAiRewrite', 'aiRewritePrompt',
             'groupNameTemplate', 'maxGroupsPerDay', 'groupSizeMin', 'groupSizeMax',
             'distributeType', 'timeType', 'accountGroups',
         ]
@@ -243,18 +257,126 @@ class Workbench extends Validate
     /**
      * 验证好友推送时设备必填（当targetType=2时，deviceGroups必填）
      */
-    protected function checkFriendPushDevice($value, $rule, $data)
+    protected function checkFriendPushService($value, $rule, $data)
+    {
+        if (isset($data['type']) && $data['type'] == self::TYPE_GROUP_PUSH) {
+            $targetType = isset($data['targetType']) ? intval($data['targetType']) : 1; // 默认1
+            if ($targetType == 2) {
+                if ($value !== null && $value !== '' && !is_array($value)) {
+                    return false;
+                }
+
+                $hasFriends = isset($data['wechatFriends']) && is_array($data['wechatFriends']) && count($data['wechatFriends']) > 0;
+                $hasPools = isset($data['trafficPools']) && is_array($data['trafficPools']) && count($data['trafficPools']) > 0;
+                $hasServices = is_array($value) && count(array_filter($value, function ($item) {
+                    if (is_array($item)) {
+                        return !empty($item['ownerWechatId'] ?? $item['wechatId'] ?? $item['id']);
+                    }
+                    return $item !== null && $item !== '';
+                })) > 0;
+
+                if (!$hasFriends && !$hasPools && !$hasServices) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 验证好友推送时是否选择好友或流量池（至少其一）
+     */
+    protected function checkFriendPushPools($value, $rule, $data)
+    {
+        if (isset($data['type']) && $data['type'] == self::TYPE_GROUP_PUSH) {
+            $targetType = isset($data['targetType']) ? intval($data['targetType']) : 1; // 默认1
+            if ($targetType == 2) {
+                $hasFriends = isset($data['wechatFriends']) && !empty($data['wechatFriends']);
+                $hasPools = isset($value) && $value !== null && $value !== '' && is_array($value) && count($value) > 0;
+                if (!$hasFriends && !$hasPools) {
+                    return false;
+                }
+                if (isset($value) && $value !== null && $value !== '') {
+                    if (!is_array($value)) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 验证群推送子类型（当targetType=1时，groupPushSubType必填且只能是1或2）
+     */
+    protected function checkGroupPushSubType($value, $rule, $data)
     {
         // 如果是群消息推送类型
         if (isset($data['type']) && $data['type'] == self::TYPE_GROUP_PUSH) {
-            // 如果targetType=2（好友推送），则deviceGroups必填
+            // 如果targetType=1（群推送），则groupPushSubType必填
             $targetType = isset($data['targetType']) ? intval($data['targetType']) : 1; // 默认1
-            if ($targetType == 2) {
+            if ($targetType == 1) {
                 // 检查值是否存在且有效
-                if (!isset($value) || $value === null || $value === '') {
+                if (!isset($value) || !in_array(intval($value), [1, 2])) {
                     return false;
                 }
-                if (!is_array($value) || count($value) < 1) {
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 验证群公告内容（当groupPushSubType=2时，announcementContent必填）
+     */
+    protected function checkAnnouncementContent($value, $rule, $data)
+    {
+        // 如果是群消息推送类型
+        if (isset($data['type']) && $data['type'] == self::TYPE_GROUP_PUSH) {
+            // 如果targetType=1且groupPushSubType=2（群公告），则announcementContent必填
+            $targetType = isset($data['targetType']) ? intval($data['targetType']) : 1; // 默认1
+            $groupPushSubType = isset($data['groupPushSubType']) ? intval($data['groupPushSubType']) : 1; // 默认1
+            if ($targetType == 1 && $groupPushSubType == 2) {
+                // 检查值是否存在且有效
+                if (!isset($value) || $value === null || trim($value) === '') {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 验证AI智能话术改写（当enableAiRewrite=1时，aiRewritePrompt必填）
+     */
+    protected function checkEnableAiRewrite($value, $rule, $data)
+    {
+        // 如果是群消息推送类型且是群公告
+        if (isset($data['type']) && $data['type'] == self::TYPE_GROUP_PUSH) {
+            $targetType = isset($data['targetType']) ? intval($data['targetType']) : 1; // 默认1
+            $groupPushSubType = isset($data['groupPushSubType']) ? intval($data['groupPushSubType']) : 1; // 默认1
+            if ($targetType == 1 && $groupPushSubType == 2) {
+                // 检查值是否存在且有效
+                if (!isset($value) || !in_array(intval($value), [0, 1])) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 验证AI改写提示词（当enableAiRewrite=1时，aiRewritePrompt必填）
+     */
+    protected function checkAiRewritePrompt($value, $rule, $data)
+    {
+        // 如果是群消息推送类型且是群公告
+        if (isset($data['type']) && $data['type'] == self::TYPE_GROUP_PUSH) {
+            $targetType = isset($data['targetType']) ? intval($data['targetType']) : 1; // 默认1
+            $groupPushSubType = isset($data['groupPushSubType']) ? intval($data['groupPushSubType']) : 1; // 默认1
+            $enableAiRewrite = isset($data['enableAiRewrite']) ? intval($data['enableAiRewrite']) : 0; // 默认0
+            if ($targetType == 1 && $groupPushSubType == 2 && $enableAiRewrite == 1) {
+                // 如果启用AI改写，提示词必填
+                if (!isset($value) || $value === null || trim($value) === '') {
                     return false;
                 }
             }
diff --git a/Server/application/job/CallRecordingListJob.php b/Server/application/job/CallRecordingListJob.php
index 95bd245c..3ec8d6cd 100644
--- a/Server/application/job/CallRecordingListJob.php
+++ b/Server/application/job/CallRecordingListJob.php
@@ -71,8 +71,8 @@ class CallRecordingListJob
             'secondMin' => 0,
             'secondMax' => 99999,
             'departmentIds' => '',
-            'from' => date('Y-m-d') . ' 00:00:00',
-            'to' =>  date('Y-m-d') . ' 00:00:00',
+            'from' => date('Y-m-d 00:00:00', strtotime('-100 days')),
+            'to' =>  date('Y-m-d 23:59:59'),
             'departmentId' => ''
         ];
 
diff --git a/Server/application/job/WorkbenchGroupPushJob.php b/Server/application/job/WorkbenchGroupPushJob.php
index e4a1f648..b14c266b 100644
--- a/Server/application/job/WorkbenchGroupPushJob.php
+++ b/Server/application/job/WorkbenchGroupPushJob.php
@@ -58,11 +58,18 @@ class WorkbenchGroupPushJob
     {
         try {
             // 获取所有工作台
-            $workbenches = Workbench::where(['status' => 1, 'type' => 3, 'isDel' => 0,'id' => 256])->order('id desc')->select();
+            $workbenches = Workbench::where(['status' => 1, 'type' => 3, 'isDel' => 0,'id' => 264])->order('id desc')->select();
             foreach ($workbenches as $workbench) {
                 // 获取工作台配置
-                $config = WorkbenchGroupPush::where('workbenchId', $workbench->id)->find();
-                if (!$config) {
+                $configModel = WorkbenchGroupPush::where('workbenchId', $workbench->id)->find();
+                if (!$configModel) {
+                    continue;
+                }
+
+                // 标准化配置
+                $config = $this->normalizeConfig($configModel->toArray());
+                if ($config === false) {
+                    Log::warning("消息群发：配置无效，工作台ID: {$workbench->id}");
                     continue;
                 }
 
@@ -72,7 +79,16 @@ class WorkbenchGroupPushJob
                     continue;
                 }
 
-                // 获取内容库
+                $targetType = intval($config['targetType']);
+                $groupPushSubType = intval($config['groupPushSubType']);
+
+                // 如果是群推送且是群公告，暂时跳过（晚点处理）
+                if ($targetType == 1 && $groupPushSubType == 2) {
+                    Log::info("群公告功能暂未实现，工作台ID: {$workbench->id}");
+                    continue;
+                }
+
+                // 获取内容库（群群发需要内容库，好友推送也需要内容库）
                 $contentLibrary = $this->getContentLibrary($workbench, $config);
                 if (empty($contentLibrary)) {
                     continue;
@@ -93,7 +109,7 @@ class WorkbenchGroupPushJob
         // 消息拼接  msgType(1:文本 3:图片 43:视频 47:动图表情包（gif、其他表情包） 49:小程序/其他：图文、文件)
         // 当前，type 为文本、图片、动图表情包的时候，content为string, 其他情况为对象 {type: 'file/link/...', url: '', title: '', thunmbPath: '', desc: ''}
 
-        $targetType = isset($config['targetType']) ? intval($config['targetType']) : 1; // 默认1=群推送
+        $targetType = intval($config['targetType']); // 默认1=群推送
 
         $toAccountId = '';
         $username = Env::get('api.username', '');
@@ -103,47 +119,56 @@ class WorkbenchGroupPushJob
         }
         // 建立WebSocket
         $wsController = new WebSocketController(['userName' => $username, 'password' => $password, 'accountId' => $toAccountId]);
-
+        $ownerWechatIds = $config['ownerWechatIds'] ?? $this->getOwnerWechatIds($config);
         if ($targetType == 1) {
             // 群推送
-            $this->sendToGroups($workbench, $config, $msgConf, $wsController);
+            $this->sendToGroups($workbench, $config, $msgConf, $wsController, $ownerWechatIds);
         } else {
             // 好友推送
-            $this->sendToFriends($workbench, $config, $msgConf, $wsController);
+            $this->sendToFriends($workbench, $config, $msgConf, $wsController, $ownerWechatIds);
         }
     }
 
     /**
      * 发送群消息
      */
-    protected function sendToGroups($workbench, $config, $msgConf, $wsController)
+    protected function sendToGroups($workbench, $config, $msgConf, $wsController, array $ownerWechatIds = [])
     {
-        $groups = json_decode($config['groups'], true);
-        if (empty($groups)) {
+        // 获取群推送子类型：1=群群发，2=群公告
+        $groupPushSubType = intval($config['groupPushSubType'] ?? 1); // 默认1=群群发
+
+        // 如果是群公告，暂时跳过（晚点处理）
+        if ($groupPushSubType == 2) {
+            Log::info("群公告功能暂未实现，工作台ID: {$workbench['id']}");
             return false;
         }
 
-        $groupsData = Db::name('wechat_group')->whereIn('id', $groups)->field('id,wechatAccountId,chatroomId,companyId,ownerWechatId')->select();
+        // 群群发：从groups字段获取群ID列表
+        $groups = $config['groups'] ?? [];
+        if (empty($groups)) {
+            Log::warning("群群发：未选择微信群，工作台ID: {$workbench['id']}");
+            return false;
+        }
+
+        $query = Db::name('wechat_group')
+            ->whereIn('id', $groups);
+
+        if (!empty($ownerWechatIds)) {
+            $query->whereIn('wechatAccountId', $ownerWechatIds);
+        }
+
+        $groupsData = $query
+            ->field('id,wechatAccountId,chatroomId,companyId,ownerWechatId')
+            ->select();
         if (empty($groupsData)) {
+            Log::warning("群群发：未找到微信群数据，工作台ID: {$workbench['id']}");
             return false;
         }
 
         foreach ($msgConf as $content) {
-            $sendData = [];
             $sqlData = [];
 
             foreach ($groupsData as $group) {
-                // msgType(1:文本 3:图片 43:视频 47:动图表情包（gif、其他表情包） 49:小程序/其他：图文、文件)
-                $sqlData[] = [
-                    'workbenchId' => $workbench['id'],
-                    'contentId' => $content['id'],
-                    'groupId' => $group['id'],
-                    'friendId' => null,
-                    'targetType' => 1,
-                    'wechatAccountId' => $group['wechatAccountId'],
-                    'createTime' => time()
-                ];
-
                 // 构建发送数据
                 $sendData = $this->buildSendData($content, $config, $group['wechatAccountId'], $group['id'], 'group');
                 if (empty($sendData)) {
@@ -154,77 +179,71 @@ class WorkbenchGroupPushJob
                 foreach ($sendData as $send) {
                     $wsController->sendCommunity($send);
                 }
-                //插入发送记录
+
+                // 准备插入发送记录
+                $sqlData[] = [
+                    'workbenchId' => $workbench['id'],
+                    'contentId' => $content['id'],
+                    'groupId' => $group['id'],
+                    'friendId' => null,
+                    'targetType' => 1,
+                    'wechatAccountId' => $group['wechatAccountId'],
+                    'createTime' => time()
+                ];
+            }
+
+            // 批量插入发送记录
+            if (!empty($sqlData)) {
                 Db::name('workbench_group_push_item')->insertAll($sqlData);
+                Log::info("群群发：推送了" . count($sqlData) . "个群，工作台ID: {$workbench['id']}");
             }
         }
+
+        return true;
     }
 
     /**
      * 发送好友消息
      */
-    protected function sendToFriends($workbench, $config, $msgConf, $wsController)
+    protected function sendToFriends($workbench, $config, $msgConf, $wsController, array $ownerWechatIds = [])
     {
-        $friends = json_decode($config['friends'], true);
-        $devices = json_decode($config['devices'] ?? '[]', true);
+        $friends = $config['friends'] ?? [];
+        $trafficPools = $config['trafficPools'] ?? [];
+        $devices = $config['devices'] ?? [];
 
-        // 如果好友列表为空，则根据设备查询所有好友
-        if (empty($friends)) {
-            if (empty($devices)) {
-                // 如果没有选择设备，则无法推送
-                Log::warning('好友推送：未选择设备，无法推送全部好友');
-                return false;
-            }
+        $friendsData = [];
 
-            // 根据设备查询所有好友
-            $friendsData = Db::table('s2_company_account')
-                ->alias('ca')
-                ->join(['s2_wechat_account' => 'wa'], 'ca.id = wa.deviceAccountId')
-                ->join(['s2_wechat_friend' => 'wf'], 'wf.wechatAccountId = wa.id')
-                ->where([
-                    'ca.status' => 0,
-                    'wf.isDeleted' => 0,
-                    'wa.deviceAlive' => 1,
-                    'wa.wechatAlive' => 1
-                ])
-                ->whereIn('wa.currentDeviceId', $devices)
-                ->field('wf.id,wf.wechatAccountId,wf.wechatId,wf.ownerWechatId')
-                ->group('wf.id')
-                ->select();
-        } else {
-            // 查询指定的好友信息
-            $friendsData = Db::table('s2_wechat_friend')
-                ->whereIn('id', $friends)
-                ->where('isDeleted', 0)
-                ->field('id,wechatAccountId,wechatId,ownerWechatId')
-                ->select();
+        // 指定好友
+        if (!empty($friends)) {
+            $friendsData = array_merge($friendsData, $this->getFriendsByIds($friends, $ownerWechatIds));
         }
 
+        // 流量池好友
+        if (!empty($trafficPools)) {
+            $friendsData = array_merge($friendsData, $this->getFriendsByTrafficPools($trafficPools, $workbench, $ownerWechatIds));
+        }
+
+        // 如果未选择好友或流量池，则根据设备查询所有好友
+        if (empty($friendsData)) {
+            if (empty($devices)) {
+                Log::warning('好友推送：未选择好友或流量池，且未选择设备，无法推送');
+                return false;
+            }
+            $friendsData = $this->getFriendsByDevices($devices, $ownerWechatIds);
+        }
+        $friendsData = $this->deduplicateFriends($friendsData);
         if (empty($friendsData)) {
             return false;
         }
 
-        // 获取所有已推送的好友ID列表（去重，不限制时间范围，用于过滤避免重复推送）
+        // 获取已推送的好友ID列表（不限制时间范围，避免重复推送）
         $sentFriendIds = Db::name('workbench_group_push_item')
             ->where('workbenchId', $workbench->id)
             ->where('targetType', 2)
             ->column('friendId');
-        $sentFriendIds = array_filter($sentFriendIds); // 过滤null值
-        $sentFriendIds = array_unique($sentFriendIds); // 去重
+        $sentFriendIds = array_unique(array_filter($sentFriendIds));
 
-        // 获取今日已推送的好友ID列表（用于计算今日推送人数）
-        $today = date('Y-m-d');
-        $todayStartTimestamp = strtotime($today . ' 00:00:00');
-        $todayEndTimestamp = strtotime($today . ' 23:59:59');
-        $todaySentFriendIds = Db::name('workbench_group_push_item')
-            ->where('workbenchId', $workbench->id)
-            ->where('targetType', 2)
-            ->whereTime('createTime', 'between', [$todayStartTimestamp, $todayEndTimestamp])
-            ->column('friendId');
-        $todaySentFriendIds = array_filter($todaySentFriendIds); // 过滤null值
-        $todaySentFriendIds = array_unique($todaySentFriendIds); // 去重
-
-        // 过滤掉所有已推送的好友（不限制时间范围，避免重复推送）
+        // 过滤掉所有已推送的好友
         $friendsData = array_filter($friendsData, function($friend) use ($sentFriendIds) {
             return !in_array($friend['id'], $sentFriendIds);
         });
@@ -237,13 +256,13 @@ class WorkbenchGroupPushJob
         // 重新索引数组
         $friendsData = array_values($friendsData);
 
-        // 计算剩余可推送人数（基于今日推送人数）
-        $todaySentCount = count($todaySentFriendIds);
+        // 计算剩余可推送人数（基于累计推送人数）
+        $sentFriendCount = count($sentFriendIds);
         $maxPerDay = intval($config['maxPerDay']);
-        $remainingCount = $maxPerDay - $todaySentCount;
+        $remainingCount = $maxPerDay - $sentFriendCount;
         
         if ($remainingCount <= 0) {
-            Log::info('好友推送：今日推送人数已达上限');
+            Log::info('好友推送：累计推送人数已达上限');
             return false;
         }
 
@@ -416,6 +435,349 @@ class WorkbenchGroupPushJob
         return $sendData;
     }
 
+    /**
+     * 根据好友ID获取好友信息
+     * @param array $friendIds
+     * @return array
+     */
+    protected function getFriendsByIds(array $friendIds, array $ownerWechatIds = [])
+    {
+        if (empty($friendIds)) {
+            return [];
+        }
+        $query = Db::table('s2_wechat_friend')
+            ->whereIn('id', $friendIds)
+            ->where('isDeleted', 0);
+
+        if (!empty($ownerWechatIds)) {
+            $query->whereIn('wechatAccountId', $ownerWechatIds);
+        }
+
+        $friends = $query
+            ->field('id,wechatAccountId,wechatId,ownerWechatId')
+            ->select();
+        if ($friends === false) {
+            return [];
+        }
+
+        return $friends;
+    }
+
+    /**
+     * 根据设备获取好友信息
+     * @param array $deviceIds
+     * @return array
+     */
+    protected function getFriendsByDevices(array $deviceIds, array $ownerWechatIds = [])
+    {
+        if (empty($deviceIds)) {
+            return [];
+        }
+
+        $query = Db::table('s2_company_account')
+            ->alias('ca')
+            ->join(['s2_wechat_account' => 'wa'], 'ca.id = wa.deviceAccountId')
+            ->join(['s2_wechat_friend' => 'wf'], 'wf.wechatAccountId = wa.id')
+            ->where([
+                'ca.status' => 0,
+                'wf.isDeleted' => 0,
+                'wa.deviceAlive' => 1,
+                'wa.wechatAlive' => 1
+            ])
+            ->whereIn('wa.currentDeviceId', $deviceIds);
+
+        if (!empty($ownerWechatIds)) {
+            $query->whereIn('wf.wechatAccountId', $ownerWechatIds);
+        }
+
+        $friends = $query
+            ->field('wf.id,wf.wechatAccountId,wf.wechatId,wf.ownerWechatId')
+            ->group('wf.id')
+            ->select();
+
+        if ($friends === false) {
+            return [];
+        }
+
+        return $friends->toArray();
+    }
+
+    /**
+     * 根据流量池获取好友信息
+     * @param array $trafficPools
+     * @param Workbench $workbench
+     * @return array
+     */
+        protected function getFriendsByTrafficPools(array $trafficPools, $workbench, array $ownerWechatIds = [])
+    {
+        if (empty($trafficPools)) {
+            return [];
+        }
+
+        $companyId = $workbench->companyId ?? 0;
+
+        $query = Db::name('traffic_source_package_item')
+            ->alias('tspi')
+            ->leftJoin('traffic_source_package tsp', 'tsp.id = tspi.packageId')
+            ->leftJoin('traffic_pool tp', 'tp.identifier = tspi.identifier')
+            ->leftJoin(['s2_wechat_friend' => 'wf'], 'wf.wechatId = tp.wechatId')
+            ->leftJoin(['s2_wechat_account' => 'wa'], 'wa.id = wf.wechatAccountId')
+            ->whereIn('tspi.packageId', $trafficPools)
+            ->where('tsp.isDel', 0)
+            ->where('wf.isDeleted', 0)
+            ->whereNotNull('wf.id')
+            ->whereNotNull('wf.wechatAccountId')
+            ->where(function ($query) use ($companyId) {
+                $query->whereIn('tsp.companyId', [$companyId, 0]);
+            })
+            ->where(function ($query) use ($companyId) {
+                $query->whereIn('tspi.companyId', [$companyId, 0]);
+            });
+
+        if (!empty($ownerWechatIds)) {
+            $query->whereIn('wf.wechatAccountId', $ownerWechatIds);
+        }
+
+        $friends = $query
+            ->field('wf.id,wf.wechatAccountId,wf.wechatId,wf.ownerWechatId')
+            ->group('wf.id')
+            ->select();
+
+        if (empty($friends)) {
+            Log::info('好友推送：流量池未匹配到好友');
+            return [];
+        }
+
+        if ($friends === false) {
+            return [];
+        }
+
+        return $friends;
+    }
+
+    /**
+     * 标准化群推送配置
+     * @param array $config
+     * @return array|false
+     */
+    protected function normalizeConfig(array $config)
+    {
+        $config['targetType'] = intval($config['targetType'] ?? 1);
+        $config['groupPushSubType'] = intval($config['groupPushSubType'] ?? 1);
+        if (!in_array($config['groupPushSubType'], [1, 2], true)) {
+            $config['groupPushSubType'] = 1;
+        }
+
+        $config['pushType'] = !empty($config['pushType']) ? 1 : 0;
+        $config['status'] = !empty($config['status']) ? 1 : 0;
+        $config['isLoop'] = !empty($config['isLoop']) ? 1 : 0;
+
+        $config['startTime'] = $this->normalizeTimeString($config['startTime'] ?? '00:00');
+        $config['endTime'] = $this->normalizeTimeString($config['endTime'] ?? '23:59');
+        $config['maxPerDay'] = max(0, intval($config['maxPerDay'] ?? 0));
+
+        $config['friendIntervalMin'] = max(0, intval($config['friendIntervalMin'] ?? 0));
+        $config['friendIntervalMax'] = max(0, intval($config['friendIntervalMax'] ?? $config['friendIntervalMin']));
+        if ($config['friendIntervalMin'] > $config['friendIntervalMax']) {
+            $config['friendIntervalMax'] = $config['friendIntervalMin'];
+        }
+
+        $config['messageIntervalMin'] = max(0, intval($config['messageIntervalMin'] ?? 0));
+        $config['messageIntervalMax'] = max(0, intval($config['messageIntervalMax'] ?? $config['messageIntervalMin']));
+        if ($config['messageIntervalMin'] > $config['messageIntervalMax']) {
+            $config['messageIntervalMax'] = $config['messageIntervalMin'];
+        }
+
+        $config['ownerWechatIds'] = $this->deduplicateIds($this->jsonToArray($config['ownerWechatIds'] ?? []));
+        $config['groups'] = $this->deduplicateIds($this->jsonToArray($config['groups'] ?? []));
+        $config['friends'] = $this->deduplicateIds($this->jsonToArray($config['friends'] ?? []));
+        $config['trafficPools'] = $this->deduplicateIds($this->jsonToArray($config['trafficPools'] ?? []));
+        $config['devices'] = $this->deduplicateIds($this->jsonToArray($config['devices'] ?? []));
+        $config['contentLibraries'] = $this->deduplicateIds($this->jsonToArray($config['contentLibraries'] ?? []));
+        $config['postPushTags'] = $this->deduplicateIds($this->jsonToArray($config['postPushTags'] ?? []));
+
+        return $config;
+    }
+
+    /**
+     * 将混合类型转换为数组
+     * @param mixed $value
+     * @return array
+     */
+    protected function jsonToArray($value): array
+    {
+        if (empty($value)) {
+            return [];
+        }
+
+        if (is_array($value)) {
+            return $value;
+        }
+
+        if (is_string($value)) {
+            $decoded = json_decode($value, true);
+            if (json_last_error() === JSON_ERROR_NONE) {
+                return is_array($decoded) ? $decoded : [];
+            }
+        }
+
+        return [];
+    }
+
+    /**
+     * 归一化时间字符串，保留到分钟
+     * @param string $time
+     * @return string
+     */
+    protected function normalizeTimeString(string $time): string
+    {
+        if (empty($time)) {
+            return '00:00';
+        }
+        $parts = explode(':', $time);
+        $hour = str_pad(intval($parts[0] ?? 0), 2, '0', STR_PAD_LEFT);
+        $minute = str_pad(intval($parts[1] ?? 0), 2, '0', STR_PAD_LEFT);
+        return "{$hour}:{$minute}";
+    }
+
+    /**
+     * 对ID数组进行去重并清理无效值
+     * @param array $ids
+     * @return array
+     */
+    protected function deduplicateIds(array $ids)
+    {
+        if (empty($ids)) {
+            return [];
+        }
+
+        $normalized = array_map(function ($value) {
+            if (is_array($value) && isset($value['id'])) {
+                return $value['id'];
+            }
+            if (is_object($value) && isset($value->id)) {
+                return $value->id;
+            }
+            return $value;
+        }, $ids);
+
+        $filtered = array_filter($normalized, function ($value) {
+            return $value !== null && $value !== '';
+        });
+
+        if (empty($filtered)) {
+            return [];
+        }
+
+        return array_values(array_unique($filtered));
+    }
+
+    /**
+     * 对内容列表根据内容ID去重
+     * @param mixed $contents
+     * @return array
+     */
+    protected function deduplicateContentList($contents)
+    {
+        if (empty($contents)) {
+            return [];
+        }
+
+        if ($contents instanceof \think\Collection || $contents instanceof \think\model\Collection) {
+            $contents = $contents->toArray();
+        } elseif ($contents instanceof \think\Model) {
+            $contents = [$contents->toArray()];
+        }
+
+        if (!is_array($contents)) {
+            return [];
+        }
+
+        $result = [];
+        $unique = [];
+
+        foreach ($contents as $content) {
+            if ($content instanceof \think\Model) {
+                $content = $content->toArray();
+            } elseif (is_object($content)) {
+                $content = (array)$content;
+            }
+
+            if (!is_array($content)) {
+                continue;
+            }
+
+            $contentId = $content['id'] ?? null;
+            if (empty($contentId) || isset($unique[$contentId])) {
+                continue;
+            }
+
+            $unique[$contentId] = true;
+            $result[] = $content;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 对好友数据进行去重
+     * @param array $friends
+     * @return array
+     */
+    protected function deduplicateFriends(array $friends)
+    {
+        if (empty($friends)) {
+            return [];
+        }
+
+        $unique = [];
+        $result = [];
+
+        foreach ($friends as $friend) {
+            if (empty($friend['id'])) {
+                continue;
+            }
+            if (isset($unique[$friend['id']])) {
+                continue;
+            }
+            $unique[$friend['id']] = true;
+            $result[] = $friend;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 获取配置中的客服微信ID列表
+     * @param array $config
+     * @return array
+     */
+    protected function getOwnerWechatIds($config)
+    {
+        if (empty($config['ownerWechatIds'])) {
+            return [];
+        }
+
+        $ownerWechatIds = $config['ownerWechatIds'];
+
+        if (is_string($ownerWechatIds)) {
+            $decoded = json_decode($ownerWechatIds, true);
+            if (json_last_error() === JSON_ERROR_NONE) {
+                $ownerWechatIds = $decoded;
+            }
+        }
+
+        if (!is_array($ownerWechatIds)) {
+            return [];
+        }
+
+        $ownerWechatIds = array_map(function ($id) {
+            return is_numeric($id) ? intval($id) : $id;
+        }, $ownerWechatIds);
+
+        return $this->deduplicateIds($ownerWechatIds);
+    }
+
 
     /**
      * 记录发送历史
@@ -441,10 +803,10 @@ class WorkbenchGroupPushJob
     }
 
     /**
-     * 获取设备列表
+     * 判断是否推送
      * @param Workbench $workbench 工作台
-     * @param WorkbenchGroupPush $config 配置
-     * @return array|bool
+     * @param array $config 配置
+     * @return bool
      */
     protected function isPush($workbench, $config)
     {
@@ -463,27 +825,34 @@ class WorkbenchGroupPushJob
             return false;
         }
 
-        $targetType = isset($config['targetType']) ? intval($config['targetType']) : 1; // 默认1=群推送
+        $targetType = intval($config['targetType']); // 默认1=群推送
 
         if ($targetType == 2) {
             // 好友推送：maxPerDay表示每日推送人数
-            // 查询今日已推送的好友ID列表（去重，仅统计今日）
+            // 查询已推送的好友ID列表（去重）
             $sentFriendIds = Db::name('workbench_group_push_item')
                 ->where('workbenchId', $workbench->id)
                 ->where('targetType', 2)
-                ->whereTime('createTime', 'between', [$startTimestamp, $endTimestamp])
                 ->column('friendId');
             $sentFriendIds = array_filter($sentFriendIds); // 过滤null值
-            $count = count(array_unique($sentFriendIds)); // 去重后统计今日推送人数
+            $count = count(array_unique($sentFriendIds)); // 去重后统计累计推送人数
             
             if ($count >= $config['maxPerDay']) {
                 return false;
             }
 
-            // 计算本次同步的最早允许时间（按人数计算间隔）
-            $interval = floor($totalSeconds / $config['maxPerDay']);
-            $nextSyncTime = $startTimestamp + $count * $interval;
-            if (time() < $nextSyncTime) {
+            // 计算本次同步的最早允许时间（基于好友/消息间隔配置）
+            $friendIntervalMin = max(0, intval($config['friendIntervalMin'] ?? 0));
+            $messageIntervalMin = max(0, intval($config['messageIntervalMin'] ?? 0));
+            $minInterval = max(1, $friendIntervalMin + $messageIntervalMin);
+
+            $lastSendTime = Db::name('workbench_group_push_item')
+                ->where('workbenchId', $workbench->id)
+                ->where('targetType', 2)
+                ->order('id', 'desc')
+                ->value('createTime');
+
+            if (!empty($lastSendTime) && (time() - $lastSendTime) < $minInterval) {
                 return false;
             }
         } else {
@@ -513,17 +882,24 @@ class WorkbenchGroupPushJob
     /**
      * 获取内容库
      * @param Workbench $workbench 工作台
-     * @param WorkbenchGroupPush $config 配置
+     * @param array $config 配置
      * @return array|bool
      */
     protected function getContentLibrary($workbench, $config)
     {
-        $contentids = json_decode($config['contentLibraries'], true);
-        if (empty($contentids)) {
+        $targetType = intval($config['targetType']); // 默认1=群推送
+        $groupPushSubType = intval($config['groupPushSubType']); // 默认1=群群发
+
+        // 如果是群公告，不需要内容库（晚点处理）
+        if ($targetType == 1 && $groupPushSubType == 2) {
             return false;
         }
 
-        $targetType = isset($config['targetType']) ? intval($config['targetType']) : 1; // 默认1=群推送
+        $contentids = $config['contentLibraries'] ?? [];
+        if (empty($contentids)) {
+            Log::warning("未选择内容库，工作台ID: {$workbench->id}");
+            return false;
+        }
 
         if ($config['pushType'] == 1) {
             $limit = 10;
@@ -563,10 +939,12 @@ class WorkbenchGroupPushJob
         if ($config['isLoop'] == 1) {
             // 可以循环发送（只有群推送时才能为1）
             // 1. 优先获取未发送的内容
-            $unsentContent = $query->where('wgpi.id', 'null')
-                ->order($order)
-                ->limit(0, $limit)
-                ->select();
+            $unsentContent = $this->deduplicateContentList(
+                $query->where('wgpi.id', 'null')
+                    ->order($order)
+                    ->limit(0, $limit)
+                    ->select()
+            );
             if (!empty($unsentContent)) {
                 return $unsentContent;
             }
@@ -585,18 +963,32 @@ class WorkbenchGroupPushJob
                 return [];
             }
 
-            $sentContent = $query2->where('wgpi.contentId', '<', $lastSendData['contentId'])->order('wgpi.id ASC')->group('wgpi.contentId')->limit(0, $limit)->select();
+            $sentContent = $this->deduplicateContentList(
+                $query2->where('wgpi.contentId', '<', $lastSendData['contentId'])
+                    ->order('wgpi.id ASC')
+                    ->group('wgpi.contentId')
+                    ->limit(0, $limit)
+                    ->select()
+            );
 
             if (empty($sentContent)) {
-                $sentContent = $query3->where('wgpi.contentId', '=', $fastSendData['contentId'])->order('wgpi.id ASC')->group('wgpi.contentId')->limit(0, $limit)->select();
+                $sentContent = $this->deduplicateContentList(
+                    $query3->where('wgpi.contentId', '=', $fastSendData['contentId'])
+                        ->order('wgpi.id ASC')
+                        ->group('wgpi.contentId')
+                        ->limit(0, $limit)
+                        ->select()
+                );
             }
             return $sentContent;
         } else {
             // 不能循环发送，只获取未发送的内容（好友推送时isLoop=0）
-            $list = $query->where('wgpi.id', 'null')
-                ->order($order)
-                ->limit(0, $limit)
-                ->select();
+            $list = $this->deduplicateContentList(
+                $query->where('wgpi.id', 'null')
+                    ->order($order)
+                    ->limit(0, $limit)
+                    ->select()
+            );
             return $list;
         }
     }
diff --git a/Server/application/superadmin/controller/company/CreateCompanyController.php b/Server/application/superadmin/controller/company/CreateCompanyController.php
index c01e2a7f..fcbbc3bd 100644
--- a/Server/application/superadmin/controller/company/CreateCompanyController.php
+++ b/Server/application/superadmin/controller/company/CreateCompanyController.php
@@ -176,9 +176,9 @@ class CreateCompanyController extends BaseController
     protected function createFuncUsers(array $params): void
     {
         $seedCols = [
-            ['account' => $params['account'] . '_01', 'username' => $params['username'] . '_子账号01', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
-            ['account' => $params['account'] . '_02', 'username' => $params['username'] . '_子账号02', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
-            ['account' => $params['account'] . '_03', 'username' => $params['username'] . '_子账号03', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
+            ['account' => $params['account'] . '_01', 'username' => $params['username'] . '_子账号01', 'status' => UsersModel::ADMIN_STP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::MASTER_USER],
+            ['account' => $params['account'] . '_02', 'username' => $params['username'] . '_子账号02', 'status' => UsersModel::ADMIN_STP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::MASTER_USER],
+            ['account' => $params['account'] . '_03', 'username' => $params['username'] . '_子账号03', 'status' => UsersModel::ADMIN_STP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::MASTER_USER],
             ['account' => $params['account'] . '_offline', 'username' => $params['username'] . '_处理离线专用', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
             ['account' => $params['account'] . '_delete', 'username'  => $params['username'] . '_处理删除专用', 'status' => UsersModel::STATUS_STOP, 'isAdmin' => UsersModel::ADMIN_OTP, 'typeId' => UsersModel::NOT_USER],
         ];
@@ -257,20 +257,7 @@ class CreateCompanyController extends BaseController
         }
     }
 
-    /**
-     * 设置部门权限
-     *
-     * @param array $params
-     * @return void
-     * @throws Exception
-     */
-    protected function setDepartmentPrivileges(array $params): void
-    {
 
-        $params = ArrHelper::getValue('companyId=departmentId', $params);
-        $accountController = new \app\api\controller\AccountController();
-        $accountController->setPrivileges(['id' => $params['companyId']]);
-    }
 
     /**
      * 创建新项目
@@ -292,9 +279,6 @@ class CreateCompanyController extends BaseController
             $this->createFuncUsers($params);
             Db::commit();
 
-            // 设置部门权限 ?????
-            $this->setDepartmentPrivileges($params);
-
             return ResponseHelper::success();
         } catch (Exception $e) {
             Db::rollback();
diff --git a/Server/依赖.rar b/Server/依赖.rar
new file mode 100644
index 00000000..3b7bd07a
Binary files /dev/null and b/Server/依赖.rar differ
diff --git a/Store_vue/components/SideMenu.vue b/Store_vue/components/SideMenu.vue
index 33eb8d36..f3edb3c4 100644
--- a/Store_vue/components/SideMenu.vue
+++ b/Store_vue/components/SideMenu.vue
@@ -54,13 +54,37 @@
 		<!-- #endif -->
 		
 		<view v-if="show" class="side-menu-container">
-			<view class="side-menu-mask" @tap="closeSideMenu"></view>
+			<view class="side-menu-mask" @tap="closeSideMenu" @touchstart="closeSettingsDropdown"></view>
 			<view class="side-menu">
 			<view class="side-menu-header">
 				<text class="side-menu-title">AI数智员工</text>
-				<!-- <text class="close-icon" @tap="closeSideMenu">
-					<u-icon name="close" color="#333" size="24"></u-icon>
-				</text> -->
+				<!-- #ifdef APP-PLUS -->
+				<view class="header-right">
+					<view class="settings-btn" @tap="toggleSettingsDropdown">
+						<view class="settings-btn-content">
+							<u-icon name="setting" color="#333" size="24"></u-icon>
+							<text v-if="!checkingUpdate && hasNewVersion" class="version-badge">新</text>
+						</view>
+					</view>
+					<!-- 设置下拉菜单 -->
+					<view v-if="showSettingsDropdown" class="settings-dropdown">
+						<view class="dropdown-item combined-item" @tap="handleCheckUpdate(false)">
+							<view class="icon-container">
+								<u-icon name="reload" color="#5096ff" size="24"></u-icon>
+							</view>
+							<view class="text-container">
+								<view class="text-top">
+									<text class="main-text">检查更新</text>
+									<text v-if="!checkingUpdate && hasNewVersion" class="update-badge">新</text>
+								</view>
+								<view class="text-bottom">
+									<text class="version-info">当前版本 {{ currentVersion }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- #endif -->
 			</view>
 			
 		
@@ -170,21 +194,6 @@
 							</view>
 						</view>
 					</view>
-					<!-- #ifdef APP-PLUS -->
-					<view class="module-item" @tap="() => handleCheckUpdate(false)">
-						<view class="module-left">
-							<view class="module-icon green">
-								<text class="iconfont icon-shezhi" style="color: #33cc99; font-size: 24px;"></text>
-							</view>
-							<view class="module-info">
-								<text class="module-name">检查更新</text>
-								<text class="module-desc" v-if="!checkingUpdate && !hasNewVersion">当前版本 {{ currentVersion }}</text>
-								<text class="module-desc" v-if="checkingUpdate" style="color: #33cc99;">检查中...</text>
-								<text class="module-desc" v-if="!checkingUpdate && hasNewVersion" style="color: #ff6699;">发现新版本 {{ latestVersion }}</text>
-							</view>
-						</view>
-					</view>
-					<!-- #endif -->
 
 					<view class="module-item" @tap="showSettings" v-if='hide'>
 						<view class="module-left">
@@ -262,6 +271,7 @@
 		data() {
 			return {
 				hide : false,
+				showSettingsDropdown: false, // 控制设置下拉菜单显示
 				functionStatus: {
 					'autoLike': false,
 					'momentsSync': false,
@@ -374,6 +384,18 @@
 			},
 			closeSideMenu() {
 				this.$emit('close');
+				// 关闭设置下拉菜单
+				this.showSettingsDropdown = false;
+			},
+			
+			// 切换设置下拉菜单
+			toggleSettingsDropdown() {
+				this.showSettingsDropdown = !this.showSettingsDropdown;
+			},
+			
+			// 点击页面其他区域关闭下拉菜单
+			closeSettingsDropdown() {
+				this.showSettingsDropdown = false;
 			},
 			// 获取功能开关状态
 			async getFunctionStatus() {
@@ -947,6 +969,7 @@
 		align-items: center;
 		padding: 20px 15px;
 		border-bottom: 1px solid #f5f5f5;
+		position: relative;
 	}
 	
 	.side-menu-title {
@@ -960,6 +983,119 @@
 		padding: 0 10px;
 	}
 	
+	.header-right {
+		position: relative;
+	}
+	
+	.settings-btn {
+		width: 40px;
+		height: 40px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 50%;
+		position: relative;
+	}
+	
+	.settings-btn-content {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	
+	.version-badge {
+		position: absolute;
+		top: 0;
+		right: 0;
+		font-size: 10px;
+		color: #fff;
+		background-color: #ff6699;
+		border-radius: 8px;
+		min-width: 16px;
+		height: 16px;
+		padding: 0 4px;
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		transform: translate(50%, -30%);
+	}
+	
+	.settings-dropdown {
+		position: absolute;
+		top: 100%;
+		right: 0;
+		width: 160px;
+		background-color: #fff;
+		border-radius: 8px;
+		box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+		z-index: 100;
+		margin-top: 5px;
+		overflow: hidden;
+	}
+	
+	.dropdown-item {
+		display: flex;
+		align-items: center;
+		padding: 12px 15px;
+		transition: background-color 0.2s;
+	}
+	
+	.dropdown-item:active {
+		background-color: #f5f5f5;
+	}
+	
+	.combined-item {
+		display: flex;
+		align-items: center;
+		padding: 12px 15px;
+	}
+	
+	.icon-container {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-right: 12px;
+	}
+	
+	.text-container {
+		flex: 1;
+	}
+	
+	.text-top {
+		display: flex;
+		align-items: center;
+		margin-bottom: 4px;
+	}
+	
+	
+	.main-text {
+		font-size: 14px;
+		color: #333;
+		font-weight: 500;
+	}
+	
+	.version-info {
+		font-size: 12px;
+		color: #999;
+	}
+	
+	.dropdown-text {
+		font-size: 14px;
+		color: #333;
+		margin-left: 8px;
+		flex: 1;
+	}
+	
+	.update-badge {
+		font-size: 12px;
+		color: #fff;
+		background-color: #ff6699;
+		border-radius: 10px;
+		padding: 2px 6px;
+		font-weight: bold;
+	}
+	
 	.function-module {
 		padding: 15px;
 	}
diff --git a/Store_vue/manifest.json b/Store_vue/manifest.json
index c7fa191b..1fd3a94b 100644
--- a/Store_vue/manifest.json
+++ b/Store_vue/manifest.json
@@ -2,7 +2,7 @@
     "name" : "AI数智员工",
     "appid" : "__UNI__9421F6C",
     "description" : "",
-    "versionName" : "1.1.1",
+    "versionName" : "1.1.2",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */