201800

app/controller/api/Order.php

@@ -42,6 +42,23 @@ class Order extends Base
         }
     }
 
+
+    #[GetMapping('detail')]
+    public function getDataDetail(Request $request): Response
+    {
+        try {
+            $param = $this->_valid([
+                "order.require"     => trans("empty.require")
+            ],$request->method());
+            if (!is_array($param)) return error($param);
+            $order = $this->model->where("order_sn",$param['order'])->with(['product','poi'])->findOrEmpty();
+            if ($order->isEmpty()) return errorTrans("empty.data");
+            return $this->encode("ok",$order->toArray());
+        } catch (\Throwable $th) {
+            return error($th->getMessage());
+        }
+    }
+
     #[GetMapping("confirm")]
     public function confirmOrder(Request $request): Response
     {

app/controller/api/Service.php

@@ -7,6 +7,7 @@ use app\middleware\AuthMiddleware;
 use app\model\saas\SaasStore;
 use app\model\system\SystemUser;
 use LinFly\Annotation\Attributes\Route\Controller;
+use LinFly\Annotation\Attributes\Route\GetMapping;
 use LinFly\Annotation\Attributes\Route\Middleware;
 use LinFly\Annotation\Attributes\Route\PostMapping;
 use support\Request;
@@ -18,13 +19,28 @@ class Service extends Base
 {
 
 
+    /**
+     * 获取客服列表-已聊过的
+     * @param Request $request
+     * @return Response|void
+     */
+    #[GetMapping("list")]
+    public function getServiceList(Request $request)
+    {
+        try {
+            
+        } catch (\Throwable $throwable) {
+            return error($throwable->getMessage());
+        }
+    }
+
     /**
      * 分配客服
      * @param Request $request
      * @return Response
      */
     #[PostMapping("shareout")]
-    public function shareUser2Mer(Request $request)
+    public function shareUser2Mer(Request $request): Response
     {
         try {
             $param = $request->all();
@@ -33,7 +49,7 @@ class Service extends Base
             // 获取在线客服
             $service = (new SystemUser)->where("store_id",$param['poi'])->where("type",3)->where("is_line",1)->findOrEmpty();
             if ($service->isEmpty()) return $this->encode("ok",['store' => $store,'code' => 3]); // 无客服在线
-
+            return $this->encode("ok",['store' => $store,'code' => 1]); // 客服在线
         } catch (\Throwable $throwable) {
             return error($throwable->getMessage());
         }