This commit is contained in:
mkm 2023-08-08 09:15:18 +08:00
commit 3d82922c87

View File

@ -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']);
@ -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'],
@ -222,16 +223,17 @@ 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'],
'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(),
@ -255,11 +257,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'],
@ -288,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('不可更改物流状态');
//设置记录信息
@ -320,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('订单已完成不能取消订单');
//设置记录信息