From 07ffabfa52b9f578e1df69ad0b3d9144d7e03213 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 8 Jul 2024 15:18:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4StoreFinanceFlowLists?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StoreFinanceFlowLists.php                 | 52 -------------------
 1 file changed, 52 deletions(-)

diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
index 70e936b6e..a9e09c936 100644
--- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
+++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
@@ -99,58 +99,6 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt
                 $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : '';
                 $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']);
             })->toArray();
-
-        // foreach ($data as $key => $item) {
-        //     $list1 = StoreFinanceFlow::where('order_id', $item['order_id'])->where('financial_type', '>', 1)->field($field)->select()->each(function ($item) {
-        //         if ($item['user_id'] <= 0) {
-        //             $item['nickname'] = '游客';
-        //         } else {
-        //             $id = $item['user_id'];
-        //             $item['nickname'] = User::where('id', $item['user_id'])->value('nickname') . "|$id";
-        //         }
-        //         if (!empty($this->request->adminInfo['store_id'])) {
-        //             $item['financial_pm'] = $item['financial_pm'] == 0 ? 1 : 0;
-        //         }
-        //         if ($item['financial_pm'] == 0) {
-        //             $item['number'] = '-' . $item['number'];
-        //             $item['financial_type_name'] = '订单支出:' . OrderEnum::getFinancialType($item['financial_type']);
-        //         } else {
-        //             $item['financial_type_name'] = OrderEnum::getFinancialType($item['financial_type']) . '获得';
-        //             $item['number'] = '+' . $item['number'];
-        //         }
-        //         $item['staff_name'] = SystemStoreStaff::where('id', $item['staff_id'])->value('staff_name');
-        //         $item['store_name'] = $item['store_id'] > 0 ? SystemStore::where('id', $item['store_id'])->value('name') : '';
-        //         $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']);
-        //     });
-        //     $list2 = UserSign::where('order_id', $item['order_sn'])->whereIn('user_ship', [0, 2, 3])->select();
-        //     foreach ($list2 as $k => $v) {
-        //         $list2[$k]['id'] = 'JF' . $v['id'];
-        //         $list2[$k]['order_sn'] = $item['order_sn'];
-        //         $list2[$k]['store_name'] = $item['store_name'];
-        //         if($v['user_ship']==0){
-        //             $list2[$k]['financial_pm'] = 1;
-        //             $list2[$k]['number'] = '+' . $v['number'];
-        //         }else{
-        //             if($v['financial_pm']==1){
-        //                 $list2[$k]['financial_pm'] = 1;
-        //                 $list2[$k]['number'] = '+' . $v['number'];
-        //             }else{
-        //                 $list2[$k]['financial_pm'] = 0;
-        //                 $list2[$k]['number'] = '-' . $v['number'];
-        //             }
-        //         }
-        //         $list2[$k]['nickname'] = $v['uid'] > 0 ? User::where('id', $v['uid'])->value('nickname') . '|' . $v['uid'] : '游客';
-        //         $list2[$k]['financial_type_name'] = $v['title'];
-        //         $list2[$k]['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']);
-        //     }
-        //     $list3 = array_merge($list1->toArray(), $list2->toArray());
-        //     // 提取 financial_pm 字段到单独的数组
-        //     $financial_pm = array_column($list3, 'financial_pm');
-
-        //     // 对 financial_pm 数组进行排序，这将影响原始数组
-        //     array_multisort($financial_pm, SORT_ASC, $list3);
-        //     $data[$key]['list']=$list3;
-        // }
         return $data;
     }