From ea304553126da794339b5fbc81d4ac5931b096ff Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 25 Nov 2024 11:45:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E6=B7=BB=E5=8A=A0=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E6=94=AF=E4=BB=98=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在提前订单列表中添加实际支付金额字段
- 从 StoreOrder 模型中获取支付金额信息
- 在导出功能中包含支付金额数据
---
 app/admin/lists/beforehand_order/BeforehandOrderLists.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php
index 4dae1ab62..13d469b07 100644
--- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php
+++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php
@@ -144,8 +144,9 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
                 $phone = '';
                 $address = '';
                 $arrival_time = '';
+                $pay_price = '';
                 if($export==2 && $item['order_sn']!=''){
-                    $find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type')->find();
+                    $find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type,pay_price')->find();
                     if($find){
                         switch ($find['pay_type']) {
                             case 3:
@@ -170,6 +171,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
                         $item['pay_type_name'] = $pay_type_name;
                         if($find['paid']==1){
                             $pay_status = '已付款';
+                            $pay_price = $find['pay_price'];
                         }else{
                             $pay_status = '未付款';
                         }
@@ -193,6 +195,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
                 $item['phone'] = $phone;
                 $item['address'] = $address;
                 $item['arrival_time'] = $arrival_time;
+                $item['pay_price'] = $pay_price;
 
             })
             ->toArray();
@@ -248,6 +251,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
             'create_time' => '时间',
             'pay_status' => '支付状态',
             'pay_type_name' => '支付方式',
+            'pay_price' => '实际支付',
             'nickname' => '用户',
             'phone' => '手机',
             'address' => '地址',