123

黄超
application/admin/controller/Order.php
application/admin/lang/zh-cn/order.php
application/api/controller/Car.php
application/api/controller/v1/Login.php
public/kevin_wx_xcx_push.log
--- a/application/admin/controller/Order.php
查看文件 @38cef4e
+++ b/application/admin/controller/Order.php
查看文件 @38cef4e
@@ -214,7 +214,7 @@ class Order extends Backend
     }
     public function orderinfo($ids){
-        $row = Db::name("order")->field("id,passengers,starting_point,end_point,order_no,pay_type,price,route_id,is_pay,phone,type")->find(['id' => $ids]);
+        $row = Db::name("order")->field("id,passengers,driver_id,starting_point,end_point,order_no,pay_type,price,route_id,is_pay,phone,type")->find(['id' => $ids]);
         $res=Db::name("passenger")->where("id","in",$row['passengers'])->select();
         $row['passenger']="";
         foreach ($res as $k=>$v) {
@@ -244,8 +244,13 @@ class Order extends Backend
         }elseif($row['pay_type']=="background"){
             $row['pay_type']="后台下单";
         }
+        $driver=Db::name("driver")->find($row['driver_id']);
+        $car=Db::name("car")->where("driver_id",$row['driver_id'])->find();
+        $row['license_plate']=$car['license_plate'];
+        $row['driver_name']=$driver['name'];
         $route=Db::name("route")->find($row['route_id']);
         $row['route_name']=$route['name'];
+        unset($row['driver_id']);
         unset($row['route_id']);
             if (!$row) {
                 $this->error(__('No Results were found'));
--- a/application/admin/lang/zh-cn/order.php
查看文件 @38cef4e
+++ b/application/admin/lang/zh-cn/order.php
查看文件 @38cef4e
@@ -33,6 +33,8 @@ return [
     'Refund_time'       => '退款时间',
     'Reservation_time'  => '预约时间',
     'Create_time'       => '创建时间',
+    'driver_name'       => '司机名称',
+    'license_plate'       => '车牌号',
     'IDcard'       => '身份证',
     'Driver.name'       => '司机名称',
     'Car.license_plate' => '车牌号',
--- a/application/api/controller/Car.php
查看文件 @38cef4e
+++ b/application/api/controller/Car.php
查看文件 @38cef4e
@@ -503,6 +503,7 @@ class Car extends Base
             ->join("route b", "a.route_id=b.id")
             ->field("a.*,b.start_address,b.end_address")
             ->where($w)
+            ->order("id desc")
             ->page($page, $total)
             ->select();
         foreach ($res as $k => $v) {
@@ -514,6 +515,7 @@ class Car extends Base
             ->join("route b", "a.route_id=b.id")
             ->field("a.*,b.start_address,b.end_address")
             ->where($w)
+            ->order("id desc")
             ->count();
         $data = ["data" => $res, "amount" => $amount];
@@ -538,6 +540,7 @@ class Car extends Base
             ->join("route b", "a.route_id=b.id")
             ->field("a.*,b.start_address,b.end_address")
             ->where($w)
+            ->order("id desc")
             ->page($page, $total)
             ->select();
         $amount = Db::name("order")
--- a/application/api/controller/v1/Login.php
查看文件 @38cef4e
+++ b/application/api/controller/v1/Login.php
查看文件 @38cef4e
@@ -24,6 +24,7 @@ class Login extends Base
      */
     public function get_user_by_shouquan()
     {
+        print_r(123123123);return;
         $appid = "wx58ceff4e93cfc523";
         $AppSecret = "baf744d21875280a5e98611f66adaf91";
         $post = $this->request->post();
--- a/public/kevin_wx_xcx_push.log
查看文件 @38cef4e
+++ b/public/kevin_wx_xcx_push.log
查看文件 @38cef4e
@@ -57,6 +57,7 @@
 2024-06-06 11:58:53《227》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3490567940502421507}"
 2024-06-06 12:02:20《228》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3490571423972491270}"
 2024-06-06 12:12:20《229》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3490581476343447558}"
+<<<<<<< HEAD
 2024-06-07 17:23:33《229》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3492344320135233537}"
 2024-06-07 17:23:34《229》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3492344326342737924}"
 2024-06-07 17:24:16《229》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3492345041152868356}"
@@ -148,3 +149,11 @@
 2024-06-14 11:43:49《281》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3502149181706338315}"
 2024-06-14 11:46:18《282》"{\"errcode\":43101,\"errmsg\":\"user refuse to accept the msg rid: 666bbd0a-6c9b7fd8-5d47d7b1\"}"
 2024-06-14 11:46:19《282》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3502151701728067591}"
+=======
+2024-06-14 11:22:19《273》"{\"errcode\":43101,\"errmsg\":\"user refuse to accept the msg rid: 666bb76c-4e14d81a-33362628\"}"
+2024-06-14 11:25:04《273》"{\"errcode\":43101,\"errmsg\":\"user refuse to accept the msg rid: 666bb811-4b286ac1-50b944bb\"}"
+2024-06-14 11:35:45《278》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3502141094048038917}"
+2024-06-14 11:45:06《278》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3502150500714283009}"
+2024-06-14 11:47:39《278》"{\"errcode\":0,\"errmsg\":\"ok\",\"msgid\":3502153061185880069}"
+2024-06-14 11:48:20《278》"{\"errcode\":43101,\"errmsg\":\"user refuse to accept the msg rid: 666bbd85-5a047009-0f6aa99c\"}"
+>>>>>>> cd8380284619a4e20ed43b2f414ce4bad7fe52eb