算力功能改版

Server/application/chukebao/controller/AccountsController.php

@@ -29,6 +29,7 @@ class AccountsController extends BaseController
 
         $query = Db::table('s2_company_account')
             ->alias('a')
+            ->join('users u', 'a.id = u.s2_accountId')
             ->where([
                 ['a.departmentId', '=', $companyId],
                 ['a.status', '=', 0],
@@ -48,6 +49,7 @@ class AccountsController extends BaseController
         $total = (clone $query)->count();
         $list = $query->field([
                 'a.id',
+                'u.id as uid',
                 'a.userName',
                 'a.realName',
                 'a.nickname',

Server/application/chukebao/controller/AiChatController.php

@@ -562,7 +562,7 @@ class AiChatController extends BaseController
         $data = [
             'tokens' => $tokenCount * 20,
             'type' => 0,
-            'form' => 1,
+            'form' => 13,
             'wechatAccountId' => $params['wechatAccountId'],
             'friendIdOrGroupId' => $params['friendId'],
             'remarks' => $remarks,
@@ -816,7 +816,7 @@ class AiChatController extends BaseController
             $data = [
                 'tokens' => $res['data']['token'],
                 'type' => 0,
-                'form' => 1,
+                'form' => 13,
                 'wechatAccountId' => $wechatAccountId,
                 'friendIdOrGroupId' => $friendId,
                 'remarks' => $remarks,

Server/application/chukebao/controller/TokensRecordController.php

@@ -100,9 +100,6 @@ class TokensRecordController extends BaseController
             return ResponseHelper::error('类型参数错误，0为减少，1为增加');
         }
 
-        if (!in_array($form, [0, 1, 2, 3, 4, 5])) {
-            return ResponseHelper::error('来源参数错误');
-        }
 
         // 重试机制，最多重试3次
         $maxRetries = 3;
@@ -130,7 +127,7 @@ class TokensRecordController extends BaseController
         Db::startTrans();
         try {
             // 使用悲观锁获取用户当前tokens余额，确保并发安全
-            $userInfo = TokensCompany::where('companyId', $companyId)->lock(true)->find();
+            $userInfo = TokensCompany::where(['companyId'=> $companyId,'userId' => $userId])->lock(true)->find();
             if (!$userInfo) {
                 throw new \Exception('用户不存在');
             }

Server/application/chukebao/controller/WechatChatroomController.php

@@ -185,7 +185,7 @@ class WechatChatroomController extends BaseController
             $data = [
                 'tokens' => $res['data']['token'],
                 'type' => 0,
-                'form' => 3,
+                'form' => 14,
                 'wechatAccountId' => $wechatAccountId,
                 'friendIdOrGroupId' => $groupId,
                 'remarks' => $remarks,