Merge branch 'develop'

2025-07-29 09:00:04 +08:00
parent a551507e4d
commit d74b374198
106 changed files with 6754 additions and 1346 deletions
@@ -12,7 +12,7 @@ class AuthController extends BaseController
    /**
     * 不需要头信息的方法
     */
-    protected $noNeedHeader = ['feishuAuth'];
+    protected $noNeedHeaderData = ['feishuAuth'];

    protected $noNeedLogin = ['feishuScope', 'login', 'register', 'feishuAuth'];

@@ -10,10 +10,54 @@ use support\Request;

 class BaseController
 {
+    /**
+     * 响应处理、数据格式化处理
+     */
    use ResponseTrait, DataTransformer;

+    /**
+     * 验证器
+     * @var Validate
+     */
    protected mixed $validator = null;

+    /**
+     * @var Model
+     */
+    protected $model = null;
+
+    /**
+     * 不登录不鉴权
+     * @var array
+     */
+    protected $noNeedLogin = [];
+
+    /**
+     * 登录不鉴权
+     * @var array
+     */
+    protected $noNeedAuth = [];
+
+    /**
+     * 不用头部数据
+     * @var array
+     */
+    protected $noNeedHeaderData = [];
+
+    /**
+     * 数据限制
+     * null 不做限制，任何管理员都可以查看该表的所有数据
+     * auth 管理员能看到自己以及自己的子管理员插入的数据
+     * personal 管理员只能看到自己插入的数据
+     * @var string
+     */
+    protected $dataLimit = null;
+
+    /**
+     * 数据限制字段
+     */
+    protected $dataLimitField = 'admin_id';
+
    /**
     * 验证数据
     *
@@ -0,0 +1,136 @@
+<?php
+
+namespace app\common\controller;
+
+use support\Request;
+use support\Response;
+use app\common\utils\FeishuMessage;
+use app\inquiry\service\InquiryLogService;
+use app\common\model\CrmCustomer;
+use app\common\model\InquiryLog;
+use app\common\model\User;
+use support\exception\BusinessException;
+
+class NotifyController
+{
+
+    /**
+     * 不用头部数据
+     * @var array
+     */
+    protected $noNeedHeaderData = ['feishuCallback', 'feishuEvent'];
+
+    /**
+     * 不登录不鉴权
+     * @var array
+     */
+    protected $noNeedLogin = ['feishuCallback', 'feishuEvent'];
+
+    /**
+     * 飞书回调
+     * @param Request $request
+     * @return Response
+     */
+    public function feishuCallback(Request $request)
+    {
+        try {
+            $param = $request->post();
+
+            // 解析数据
+            // $param = json_decode($param['event'], true);
+            $orderSn = $param['event']['action']['value'];
+            if (strpos($orderSn, '"') !== false) {
+                $orderSn = str_replace('"', '', $orderSn);
+            }
+
+            // 处理询单&客户线索信息
+            $openId = $param['event']['operator']['open_id'];
+
+            // 获取询单
+            $order = InquiryLog::with(['channelInfo', 'countryInfo', 'enter'])->where('order_no', $orderSn)->first();
+            if (!$order) {
+                return $this->error('未找到询单记录');
+            }
+
+            // 获取客户xians
+            $customer = CrmCustomer::where('sn', $orderSn)->first();
+            if (!$customer) {
+                return $this->error('未找到客户线索');
+            }
+
+            // 获取用户
+            $uinfo = User::where('open_id', $openId)->first();
+
+            // 更新客户线索
+            $customer->user_id = $uinfo->id;
+
+            // 更新询单数据
+            $order->recipient = $uinfo->id;
+            $order->status = 2;
+            $order->t_time = time();
+
+            // 保存
+            if (!$order->save() || !$customer->save()) {
+                return $this->error('跟踪失败');
+            }
+            
+            // 获取飞书消息模板
+            $feishuMessage = new FeishuMessage();
+            $content = $feishuMessage->groupUpdateTemplates(
+                (new InquiryLogService())->qualityName($order->quality),
+                $order->order_no,
+                $order->channelInfo ? $order->channelInfo->name : '',
+                $order->countryInfo ? $order->countryInfo->cn_addr : '',
+                $order->enter ? $order->enter->name : '',
+                $order->r_time ? date('Y-m-d H:i:s', $order->r_time) : '',
+                $order->t_time ? date('Y-m-d H:i:s', $order->t_time) : ''
+            );
+
+            // 组装飞书消息模板
+            $data = '{
+                "toast": {
+                    "type": "success",
+                    "content": "操作成功"
+                },
+                "card": {
+                    "type": "raw",
+                    "data": '.$content.'
+                }
+            }';
+            
+            // 响应消息
+            return new Response(200, ['Content-Type' => 'application/json'], $data);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    public function error($msg = '')
+    {
+        $data = '{
+            "toast": {
+                "type": "error",
+                "content": "'.$msg.'"
+            }
+        }';
+        return new Response(200, ['Content-Type' => 'application/json'], $data);
+    }
+
+    /**
+     * 飞书事件
+     * @param Request $request
+     * @return Response
+     */
+    public function feishuEvent(Request $request)
+    {
+        try {
+            $data = $request->post();
+
+            var_dump('飞书事件回调：'.$data);
+            
+            return json($data);
+        } catch (\Throwable $e) {
+            return json($e->getMessage());
+        }
+    }
+}
@@ -5,11 +5,15 @@ namespace app\common\controller;
 use support\Request;
 use app\common\service\CorpService;
 use app\common\service\CorpFeishuAppService;
+use app\common\service\SystemsService;
+use app\common\service\UserService;

 class PresetController extends BaseController
 {

-    protected $noNeedLogin = ['corps', 'feishuApp'];
+    protected $noNeedLogin = ['corps', 'feishuApp', 'systems'];
+
+    protected $noNeedHeaderData = ['corps', 'feishuApp', 'systems'];

    public function corps()
    {
@@ -27,10 +31,34 @@ class PresetController extends BaseController
    {
        try {
            $corpId = $request->get('corp_id');
-            $result = (new CorpFeishuAppService())->getFeishuApp($corpId);
+            $systemId = $request->get('system_id');
+            $result = (new CorpFeishuAppService())->getFeishuApp($corpId, $systemId);
            return $this->success($result, '获取飞书应用信息');
        } catch (\Throwable $e) {
            return $this->error($e->getMessage());
        }
    }
+
+
+
+    public function systems()
+    {
+        try {
+            $result = (new SystemsService())->getList();
+            return $this->success($result, '获取系统列表');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    
+    public function users()
+    {
+        try {
+            $result = (new UserService())->getList();
+            return $this->success($result, '获取用户列表');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
 }
@@ -12,6 +12,10 @@ class UploadController

    use ResponseTrait;

+    protected $noNeedLogin = ['proxy'];
+
+    protected $noNeedHeaderData = ['proxy'];
+
    public function upload(Request $request)
    {
        try {
@@ -15,11 +15,65 @@ class UserController extends BaseController
    {
        try {
            $uid = $request->user->uid;
-            $result = (new UserService())->getUserInfo($uid);
+            $systemCode = $request->system_code;
+            $result = (new UserService())->getUserInfo($uid, $systemCode);
            return $this->success($result, '获取用户信息');
        } catch (\Throwable $e) {
            return $this->error($e->getMessage());
        }
    }

+    /**
+     * 用户信息
+     */
+    public function getUser(Request $request)
+    {
+        try {
+            $uid = $request->user->uid;
+            $corp_abbr = $request->basic_data['corp_abbr'];
+            $result = (new UserService())->getUser($uid,$corp_abbr);
+            return $this->success($result, '获取用户信息');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 编辑用户
+     */
+    public function edit(Request $request)
+    {
+        try {
+            $uid = $request->user->uid;
+            $data = $request->all();
+            $result = (new UserService())->edit($uid,$data);
+            unset($result['password']);
+            unset($result['union_id']);
+            unset($result['open_id']);
+            unset($result['tenant_key']);
+            return $this->success($result, '编辑成功');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 修改密码
+     * @param Request $request
+     * @return \support\Response
+     * @throws \Random\RandomException
+     */
+    public function savePassword(Request $request)
+    {
+        try {
+            $uid = $request->user->uid;
+            $data = $request->all();
+            $result = (new UserService())->savePassword($uid,$data);;
+            return $this->success($result, '编辑成功');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+
 }