From 0176cf3bd596c37b21ce73b8ed69ae63afdeda89 Mon Sep 17 00:00:00 2001
From: chan <709206448@qq.com>
Date: Mon, 11 Dec 2023 17:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=B1=9E=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreRefundOrderRepository.php         |  2 +-
 app/controller/api/dataview/Order.php                  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreRefundOrderRepository.php b/app/common/repositories/store/order/StoreRefundOrderRepository.php
index 927b6261..dcb656ec 100644
--- a/app/common/repositories/store/order/StoreRefundOrderRepository.php
+++ b/app/common/repositories/store/order/StoreRefundOrderRepository.php
@@ -583,7 +583,7 @@ class StoreRefundOrderRepository extends BaseRepository
     public function getAllList(array $where, int $page, int $limit)
     {
         $query = $this->dao->search($where)->with(['order' => function ($query) {
-            $query->field('order_id,order_sn,activity_type');
+            $query->field('order_id,order_sn,activity_type,user_address_code');
         }, 'merchant' => function ($query) {
             $query->field('mer_id,mer_name,is_trader');
         }, 'refundProduct.product', 'user' => function ($query) {
diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index fd838855..52bf62ac 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -563,7 +563,15 @@ class Order extends BaseController
     {
         [$page,$limit] = $this->getPage();
         $where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']);
-        return app('json')->success($repository->getAllList($where, $page, $limit));
+        $list = $repository->getAllList($where, $page, $limit)
+        foreach($list as &$item) {
+            $userAddressCode = explode(',', $item['order']['user_address_code']);
+            $area = Db::name('geo_area')->where('area_code', $userAddressCode[0])->value('area_name');
+            $street = Db::name('geo_street')->where('street_code', $userAddressCode[0])->value('street_name');
+            $item['order']['order_from'] = $area.$street;
+        }
+        unset($item);
+        return app('json')->success($list);
     }
 
     // 核销订单