From 48376313a9888a19a38e4977af9af4119e7f4db9 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 7 Jun 2024 09:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=92=8C=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/order/OrderController.php | 15 ++++++++++++++-
 app/api/lists/order/OrderList.php            |  6 ++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php
index 4073951c..935a9f6d 100644
--- a/app/api/controller/order/OrderController.php
+++ b/app/api/controller/order/OrderController.php
@@ -9,7 +9,6 @@ use app\api\validate\OrderValidate;
 use app\common\enum\PayEnum;
 use app\common\logic\PaymentLogic;
 use app\common\logic\PayNotifyLogic;
-use app\common\model\retail\Cashierclass;
 use app\common\model\store_order\StoreOrder;
 use app\common\model\system_store\SystemStoreStaff;
 use app\common\model\user\UserAddress;
@@ -475,6 +474,20 @@ class OrderController extends BaseApiController
         $res = StoreOrder::where($where)->whereDay('create_time', $date)->count();
         return $this->success('ok', ['order_count' => $res]);
     }
+    
+    
+    //订单退款申请
+    public function apply_refund()
+    {
+        $params = (new OrderValidate())->post()->goCheck('add');
+        $uid = $this->userId;
+//        OrderLogic::dealRefund($uid,$params);
+
+
+        
+    }
+    
+    
 
 
 }
diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php
index 8c9eadd3..2d1857f9 100644
--- a/app/api/lists/order/OrderList.php
+++ b/app/api/lists/order/OrderList.php
@@ -44,12 +44,14 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
     {
         $userId=$this->request->userId;
         if(!$userId) return [];
-        return StoreOrder::with(['store'])->where($this->searchWhere)->where('uid',$userId)
+       return StoreOrder::with(['store'])->where($this->searchWhere)->where('uid',$userId)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
             ->each(function($item){
-                $item['goods_list']=StoreOrderCartInfo::where('oid',$item['id'])->with('goodsName')->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time')->limit(3)->select();
+                $item['goods_list']=StoreOrderCartInfo::where('oid',$item['id'])->with(['goodsName'=> function ($query) {
+                    $query->withTrashed();
+                }])->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time')->limit(3)->select();
                 $item['goods_count']=count(explode(',',$item['cart_id']));
             })
             ->toArray();