mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 移除StoreFinanceFlowLists中的冗余代码

Browse Source
This commit is contained in:
mkm 2024-07-08 15:18:56 +08:00
parent 4035333cd4
commit 07ffabfa52
1 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php
View File

@ -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;
}