mkm/logistics
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台管理系统物流列表和详情接口增加显示字段

Browse Source
This commit is contained in:
luofei 2023-08-12 15:09:04 +08:00
parent eee86098af
commit 99c3c2e4f1
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/adminapi/lists/logistics/LogisticsLists.php
View File

@ -57,7 +57,7 @@ class LogisticsLists extends BaseAdminDataLists implements ListsSearchInterface
public function lists(): array public function lists(): array
{ {
return Logistics::where($this->searchWhere) return Logistics::where($this->searchWhere)
->field(['id', 'order_id', 'order_sn', 'courier_id', 'shop_id', 'shop_name', 'shop_phone', 'shop_address', 'shop_long', 'shop_lat', 'user_id', 'user_name', 'user_phone', 'user_address', 'status', 'qh_time', 'ps_time', 'qx_time', 'user_take_code']) ->field(['id', 'order_id', 'order_sn', 'courier_id', 'shop_id', 'shop_name', 'shop_phone', 'shop_address', 'shop_long', 'shop_lat', 'user_id', 'user_name', 'user_phone', 'user_address', 'status', 'qh_time', 'ps_time', 'qx_time','create_time', 'user_take_code'])
->where($this->searchWhere) ->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
@ -65,8 +65,9 @@ class LogisticsLists extends BaseAdminDataLists implements ListsSearchInterface
->each(function ($item) { ->each(function ($item) {
$item['status_name'] = $item->status_name; $item['status_name'] = $item->status_name;
$item['courier'] = Courier::alias('u') $item['courier'] = Courier::alias('u')
->field('u.nickname,a.phone') ->field('u.nickname,a.phone,c.company_name')
->leftjoin('la_admin a', 'u.admin_id = a.id') ->leftjoin('la_admin a', 'u.admin_id = a.id')
->leftjoin('la_company c', 'c.id = u.company_id')
->where('u.id', $item['courier_id'])->find(); ->where('u.id', $item['courier_id'])->find();
return $item; return $item;
}) })

10
app/adminapi/logic/logistics/LogisticsLogic.php
View File

@ -20,6 +20,7 @@ use app\common\model\logistics\Logistics;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\logistics\LogisticsRecord; use app\common\model\logistics\LogisticsRecord;
use app\common\model\logistics\Product; use app\common\model\logistics\Product;
use app\common\model\logistics\User;
/** /**
@ -43,8 +44,9 @@ class LogisticsLogic extends BaseLogic
$logistics['status_name'] = $logistics->status_name; $logistics['status_name'] = $logistics->status_name;
//获取配送员信息 //获取配送员信息
$courier = Courier::alias('u') $courier = Courier::alias('u')
->field('u.nickname,a.phone') ->field('u.nickname,a.phone,c.company_name')
->leftjoin('la_admin a', 'u.admin_id = a.id') ->leftjoin('la_admin a', 'u.admin_id = a.id')
->leftjoin('la_company c', 'c.id = u.company_id')
->where('u.id', $logistics['courier_id'])->find(); ->where('u.id', $logistics['courier_id'])->find();
$logistics['courier'] = $courier; $logistics['courier'] = $courier;
//获取商品信息 //获取商品信息
@ -53,6 +55,9 @@ class LogisticsLogic extends BaseLogic
$pro_item['cart_info'] = json_decode($pro_item['cart_info'], true); $pro_item['cart_info'] = json_decode($pro_item['cart_info'], true);
$pro_item['goods_name'] = $pro_item['cart_info']['product']['store_name']; $pro_item['goods_name'] = $pro_item['cart_info']['product']['store_name'];
$pro_item['goods_unit'] = $pro_item['cart_info']['product']['unit_name']; $pro_item['goods_unit'] = $pro_item['cart_info']['product']['unit_name'];
$pro_item['goods_pic'] = $pro_item['cart_info']['product']['image'];
$pro_item['goods_price'] = $pro_item['cart_info']['product']['price'];
$pro_item['goods_total_price'] = $pro_item['cart_info']['product']['price'] * $pro_item['product_num'];
$product_count += $pro_item['product_num']; $product_count += $pro_item['product_num'];
unset($pro_item['cart_info']); unset($pro_item['cart_info']);
return $pro_item; return $pro_item;
@ -77,6 +82,9 @@ class LogisticsLogic extends BaseLogic
unset($red_item['type'], $red_item['user_name']); unset($red_item['type'], $red_item['user_name']);
})->toArray(); })->toArray();
$logistics['records'] = $records; $logistics['records'] = $records;
//获取下单用户信息
$orderUser = User::field('uid,nickname,phone')->where('uid',$logistics['user_id'])->find();
$logistics['order_user'] = $orderUser;
//返回数据 //返回数据
return $logistics->toArray(); return $logistics->toArray();
} }

2
app/api/logic/LogisticsLogic.php
View File

@ -211,7 +211,7 @@ class LogisticsLogic extends BaseLogic
'type' => 1, 'type' => 1,
'user_name' => $orderUser['nickname'], 'user_name' => $orderUser['nickname'],
'user_phone' => $orderUser['phone'], 'user_phone' => $orderUser['phone'],
'content' => '用户提交订单', 'content' => '已提交订单',
'create_time' => time(), 'create_time' => time(),
]); ]);
Logistics::commit(); Logistics::commit();