From 8e13d8f0dd034a45c2d7b3cb715599f9c0081aad Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 25 Nov 2024 15:08:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将订单支付信息查询逻辑移至独立位置，提高代码可读性
- 增加对非空订单号的判断，避免不必要的查询
- 优化支付状态和支付方式的处理逻辑
---
 .../beforehand_order/BeforehandOrderLists.php | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php
index 13d469b07..b90d50a3f 100644
--- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php
+++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php
@@ -145,35 +145,37 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
                 $address = '';
                 $arrival_time = '';
                 $pay_price = '';
-                if($export==2 && $item['order_sn']!=''){
-                    $find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type,pay_price')->find();
-                    if($find){
-                        switch ($find['pay_type']) {
-                            case 3:
-                                $pay_type_name = '余额支付';
-                                break;
-                            case 7:
-                                $pay_type_name = '微信支付';
-                                break;
-                            case 9:
-                                $pay_type_name = '微信条码';
-                                break;
-                            case 13:
-                                $pay_type_name = '支付宝条码';
-                                break;
-                            case 17:
-                                $pay_type_name = '现金支付';
-                                break;
-                            case 18:
-                                $pay_type_name = '采购款支付';
-                                break;
-                        }
-                        $item['pay_type_name'] = $pay_type_name;
-                        if($find['paid']==1){
-                            $pay_status = '已付款';
-                            $pay_price = $find['pay_price'];
-                        }else{
-                            $pay_status = '未付款';
+                if($export==2){
+                    if($item['order_sn']!=''){
+                        $find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type,pay_price')->find();
+                        if($find){
+                            switch ($find['pay_type']) {
+                                case 3:
+                                    $pay_type_name = '余额支付';
+                                    break;
+                                case 7:
+                                    $pay_type_name = '微信支付';
+                                    break;
+                                case 9:
+                                    $pay_type_name = '微信条码';
+                                    break;
+                                case 13:
+                                    $pay_type_name = '支付宝条码';
+                                    break;
+                                case 17:
+                                    $pay_type_name = '现金支付';
+                                    break;
+                                case 18:
+                                    $pay_type_name = '采购款支付';
+                                    break;
+                            }
+                            $item['pay_type_name'] = $pay_type_name;
+                            if($find['paid']==1){
+                                $pay_status = '已付款';
+                                $pay_price = $find['pay_price'];
+                            }else{
+                                $pay_status = '未付款';
+                            }
                         }
                     }
                     if($item['warehousing_id']>0){