From 8c7684477f51d08e3a17dd71fe1ba5d28e47c432 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 12 Jun 2024 16:39:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/lists/order/OrderList.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php
index e779a853d..f1ba4dd47 100644
--- a/app/api/lists/order/OrderList.php
+++ b/app/api/lists/order/OrderList.php
@@ -54,7 +54,7 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
$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()
->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['image'] = $find['image'];
$v['price'] = $find['price'];
@@ -67,6 +67,9 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
if ($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();
From baa01821e206d901e6952266bd2a33bbdde739eb Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 12 Jun 2024 16:59:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/order/OrderController.php | 3 ++-
app/api/logic/order/OrderLogic.php | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php
index 894f1833a..0ee0d5be4 100644
--- a/app/api/controller/order/OrderController.php
+++ b/app/api/controller/order/OrderController.php
@@ -367,7 +367,8 @@ class OrderController extends BaseApiController
'id' => $order_id,
'uid' => $this->userId,
];
- $order = OrderLogic::detail($where);
+ $url = 'https://'.$this->request->host(true);
+ $order = OrderLogic::detail($where,$url);
if ($order) {
return $this->data($order);
} else {
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 3e01812db..58003aeb1 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -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();
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();
$find['store_info'] = $store;
+
+ if($find['verify_img']){
+ $find['verify_img'] = 'https://'.$url.$find['verify_img'];
+ }
}
return $find;
}
From acb37149ca928194f354ffb09ec18f5f204ae78c Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 12 Jun 2024 17:09:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?=
=?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/logic/order/OrderLogic.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 58003aeb1..d7e64fbcb 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -380,7 +380,7 @@ class OrderLogic extends BaseLogic
$find['store_info'] = $store;
if($find['verify_img']){
- $find['verify_img'] = 'https://'.$url.$find['verify_img'];
+ $find['verify_img'] = $url.$find['verify_img'];
}
}
return $find;