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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-06-12 18:17:01 +08:00
commit a37151676b
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,7 +367,8 @@ class OrderController extends BaseApiController
'id' => $order_id, 'id' => $order_id,
'uid' => $this->userId, 'uid' => $this->userId,
]; ];
$order = OrderLogic::detail($where); $url = 'https://'.$this->request->host(true);
$order = OrderLogic::detail($where,$url);
if ($order) { if ($order) {
return $this->data($order); return $this->data($order);
} else { } else {

5
app/api/lists/order/OrderList.php
View File

@ -54,7 +54,7 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
$item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id']) $item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id'])
->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select() ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select()
->each(function ($v) use ($item) { ->each(function ($v) use ($item) {
$find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->find(); $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->withTrashed()->find();
$v['store_name'] = $find['store_name']; $v['store_name'] = $find['store_name'];
$v['image'] = $find['image']; $v['image'] = $find['image'];
$v['price'] = $find['price']; $v['price'] = $find['price'];
@ -67,6 +67,9 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
if ($item['pay_time']) { if ($item['pay_time']) {
$item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']); $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']);
} }
if($item['verify_img']){
$item['verify_img'] = 'https://'.$this->request->host(true).$item['verify_img'];
}
}) })
->toArray(); ->toArray();

6
app/api/logic/order/OrderLogic.php
View File

@ -360,7 +360,7 @@ class OrderLogic extends BaseLogic
} }
public static function detail($params): array public static function detail($params,$url=''): array
{ {
$find = StoreOrder::where($params)->findOrEmpty()->toArray(); $find = StoreOrder::where($params)->findOrEmpty()->toArray();
if ($find) { if ($find) {
@ -378,6 +378,10 @@ class OrderLogic extends BaseLogic
$store = SystemStore::where('id', $find['store_id'])->field('id,name,phone,address,detailed_address')->find(); $store = SystemStore::where('id', $find['store_id'])->field('id,name,phone,address,detailed_address')->find();
$find['store_info'] = $store; $find['store_info'] = $store;
if($find['verify_img']){
$find['verify_img'] = $url.$find['verify_img'];
}
} }
return $find; return $find;
} }