mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '订单详情接口支持商家查询' (#240) from dev into main

Browse Source 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/240
This commit is contained in:
mkm 2024-10-08 19:49:45 +08:00
commit 6d61f2e556
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/api/controller/order/OrderController.php
View File

@ -339,10 +339,17 @@ class OrderController extends BaseApiController
public function detail() public function detail()
{ {
$order_id = (int)$this->request->get('order_id'); $order_id = (int)$this->request->get('order_id');
$where = [ $is_mer=$this->request->get('is_mer');
'id' => $order_id, if($is_mer==1){
'uid' => $this->userId, $where = [
]; 'id' => $order_id,
];
}else{
$where = [
'id' => $order_id,
'uid' => $this->userId,
];
}
$url = 'https://' . $this->request->host(true); $url = 'https://' . $this->request->host(true);
$order = OrderLogic::detail($where, $url); $order = OrderLogic::detail($where, $url);
if ($order) { if ($order) {