From 7f919b4ea684db259a42ef061e14de1ca9e88de9 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 7 Aug 2023 17:12:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=89=A9?= =?UTF-8?q?=E6=B5=81=E7=8A=B6=E6=80=81=E6=94=B9=E5=8F=98=E7=9A=84=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/LogisticsController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/api/controller/LogisticsController.php b/app/api/controller/LogisticsController.php index fc4c56aa..02bfce17 100644 --- a/app/api/controller/LogisticsController.php +++ b/app/api/controller/LogisticsController.php @@ -222,11 +222,12 @@ class LogisticsController extends BaseApiController { //获取参数 $logistics_id = input('logistics_id', 0, 'intval'); + $user_id = input('user_id', 0, 'intval'); //获取物流信息 - $logistics = Db::name('logistics')->where('id', $logistics_id)->where('status',0)->find(); + $logistics = Db::name('logistics')->where('id', $logistics_id)->where('courier_id',$user_id)->where('status',0)->find(); if (!$logistics) return $this->fail('物流信息不存在'); //获取配送员信息 - $courier = Db::connect('mysql3')->name('la_user')->field('real_name,mobile')->where('id', $logistics['courier_id'])->find(); + $courier = Db::connect('mysql3')->name('la_user')->field('real_name,mobile')->where('id', $user_id)->find(); //设置记录信息 $record = [ 'lst_id' => $logistics['id'], @@ -255,11 +256,12 @@ class LogisticsController extends BaseApiController { //获取参数 $logistics_id = input('logistics_id', 0, 'intval'); + $user_id = input('user_id', 0, 'intval'); //获取物流信息 - $logistics = Db::name('logistics')->where('id', $logistics_id)->where('status',1)->find(); + $logistics = Db::name('logistics')->where('id', $logistics_id)->where('courier_id',$user_id)->where('status',1)->find(); if (!$logistics) return $this->fail('物流信息不存在'); //获取配送员信息 - $courier = Db::connect('mysql3')->name('la_user')->field('real_name,mobile')->where('id', $logistics['courier_id'])->find(); + $courier = Db::connect('mysql3')->name('la_user')->field('real_name,mobile')->where('id', $user_id)->find(); //设置记录信息 $record = [ 'lst_id' => $logistics['id'], From c8c499a916335c804af383a3d52080c9f0c2a01b Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Mon, 7 Aug 2023 17:43:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=9F=E6=88=90=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=B9=B0=E5=AE=B6?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/LogisticsController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/api/controller/LogisticsController.php b/app/api/controller/LogisticsController.php index 02bfce17..8dc1e9b6 100644 --- a/app/api/controller/LogisticsController.php +++ b/app/api/controller/LogisticsController.php @@ -161,7 +161,7 @@ class LogisticsController extends BaseApiController //查找订单信息 $order = Db::connect('mysql2')->table('eb_store_order')->alias('s') ->leftjoin('eb_merchant m', 'm.mer_id = s.mer_id') - ->field('s.real_name, s.user_phone, s.user_address,s.user_address_code,m.mer_name, m.mer_phone, m.mer_address') + ->field('s.real_name, s.user_phone,s.uid, s.user_address,s.user_address_code,m.mer_name, m.mer_phone, m.mer_address') ->where('order_id', $order_id)->where('order_sn', $order_sn)->find(); if (!$order) return $this->fail('订单信息不存在'); $addressCode = explode(',', $order['user_address_code']); @@ -189,6 +189,7 @@ class LogisticsController extends BaseApiController 'shop_name' => $order['mer_name'], 'shop_phone' => $order['mer_phone'], 'shop_address' => $order['mer_address'], + 'user_id' => $order['uid'], 'user_name' => $order['real_name'], 'user_phone' => $order['user_phone'], 'user_address' => $order['user_address'], @@ -290,8 +291,9 @@ class LogisticsController extends BaseApiController { //获取参数 $logistics_id = input('logistics_id', 0, 'intval'); + $user_id = input('user_id', 0, 'intval'); //获取物流信息 - $logistics = Db::name('logistics')->where('id', $logistics_id)->find(); + $logistics = Db::name('logistics')->where('id', $logistics_id)->where('user_id',$user_id)->find(); if (!$logistics) return $this->fail('物流信息不存在'); if ($logistics['status'] == 4) return $this->fail('不可更改物流状态'); //设置记录信息 @@ -322,8 +324,9 @@ class LogisticsController extends BaseApiController { //获取参数 $logistics_id = input('logistics_id', 0, 'intval'); + $user_id = input('user_id', 0, 'intval'); //获取物流信息 - $logistics = Db::name('logistics')->where('id', $logistics_id)->find(); + $logistics = Db::name('logistics')->where('id', $logistics_id)->where('user_id',$user_id)->find(); if (!$logistics) return $this->fail('物流信息不存在'); if ($logistics['status'] == 2 || $logistics['status'] == 3 || $logistics['status'] == 4) return $this->fail('订单已完成不能取消订单'); //设置记录信息 From 41b617f82972a4049d4e4c0342c33a3bada747b4 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Tue, 8 Aug 2023 09:00:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7=E5=92=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/LogisticsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/LogisticsController.php b/app/api/controller/LogisticsController.php index 8dc1e9b6..baadda1d 100644 --- a/app/api/controller/LogisticsController.php +++ b/app/api/controller/LogisticsController.php @@ -98,7 +98,7 @@ class LogisticsController extends BaseApiController $logistics_id = input('logistics_id', 0, 'intval'); //获取物流信息 $logistics = Db::name('logistics') - ->field('id,order_id,shop_name,shop_phone,shop_address,user_name,user_address,create_time') + ->field('id,order_id,order_sn,shop_name,shop_phone,shop_address,user_name,user_address,status,create_time') ->where('id', $logistics_id)->find(); if(!$logistics) return $this->fail('物流信息不存在'); $logistics['create_time'] = date('Y-m-d H:i:s', $logistics['create_time']); From 8a3e620ceed0e19c37f89e4d81c1382b0d9be380 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Tue, 8 Aug 2023 09:11:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E5=91=98=E5=A7=93=E5=90=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/LogisticsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/LogisticsController.php b/app/api/controller/LogisticsController.php index baadda1d..93394184 100644 --- a/app/api/controller/LogisticsController.php +++ b/app/api/controller/LogisticsController.php @@ -233,7 +233,7 @@ class LogisticsController extends BaseApiController $record = [ 'lst_id' => $logistics['id'], 'type' => 2, - 'user_name' => $courier['real_name'], + 'user_name' => $courier['real_name']? $courier['real_name'] : $courier['nickname'], 'user_phone' => $courier['mobile'], 'content' => '已提取商品', 'create_time' => time(),