From 8e9e2b8ded2bea4e780401ec76c7c833421ef0f2 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 5 Sep 2024 22:13:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor(WorkbenchLogic):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86=E6=95=88=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/logic/WorkbenchLogic.php | 44 ++++++++++++++++--------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index bf80beba0..bcb3fffb7 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -158,31 +158,31 @@ class WorkbenchLogic extends BaseLogic
             ->select()
             ->toArray();
 
-        $orderList = StoreOrder::field($field)
-            ->where($where)
-            ->whereBetweenTime('pay_time', $startTime, $endTime)
-            ->group($group)
-            ->select()
-            ->toArray();
+        // $orderList = StoreOrder::field($field)
+        //     ->where($where)
+        //     ->whereBetweenTime('pay_time', $startTime, $endTime)
+        //     ->group($group)
+        //     ->select()
+        //     ->toArray();
         $userList = StoreOrder::field($field . ',count(uid) as user_num')
             ->where($where)
             ->whereBetweenTime('pay_time', $startTime, $endTime)
             ->group($group . ',uid')
             ->select()
             ->toArray();
-        $orderList = reset_index($orderList, 'pay_time');
+        // $orderList = reset_index($orderList, 'pay_time');
         $userList = reset_index($userList, 'pay_time');
-        $orderListTmp = [];
+        // $orderListTmp = [];
         $userListTmp = [];
         $range = [];
         $mergedListTmp = [];
         foreach ($timeRange as $item) {
             $range[] = $item;
-            if (!isset($orderList[$item])) {
-                $orderListTmp[$item] = 0;
-            } else {
-                $orderListTmp[$item] = $orderList[$item]['pay_price'];
-            }
+            // if (!isset($orderList[$item])) {
+            //     $orderListTmp[$item] = 0;
+            // } else {
+            //     $orderListTmp[$item] = $orderList[$item]['pay_price'];
+            // }
             if (!isset($userList[$item])) {
                 $userListTmp[$item] = 0;
             } else {
@@ -196,25 +196,29 @@ class WorkbenchLogic extends BaseLogic
                     $mergedListTmp[$item] += $recharge['pay_price'];
                 }
             }
-            foreach ($orderList as $order) {
-                if ($order['pay_time'] == $item) {
-                    $mergedListTmp[$item] += $order['pay_price'];
-                }
-            }
+            // foreach ($orderList as $order) {
+            //     if ($order['pay_time'] == $item) {
+            //         $mergedListTmp[$item] += $order['pay_price'];
+            //     }
+            // }
         }
         $data['statistics'] = [
             'range' => $range,
             'data' => [
 //                'order_amount' => array_values($orderListTmp),
                 'user_number' => array_values($userListTmp),
-                'order_amount' => array_values($mergedListTmp)
+                // 'order_amount' => array_values($mergedListTmp)
             ]
         ];
 
         $data['pay_type'] = [
             // ['name' => '线上收银订单', 'value' => bcsub($data['order_amount'], bcadd($data['verify_amount'], $data['cash_amount'], 2), 2)],
             // ['name' => '核销订单', 'value' => $data['verify_amount']],
-            ['name' => '现金收银订单', 'value' => $data['cash_amount']],
+            ['name' => '微信订单', 'value' => $data['wechat_amount']],
+            ['name' => '支付宝订单', 'value' => $data['alipay_amount']],
+            ['name' => '采购款订单', 'value' => $data['purchase_funds_amount']],
+            ['name' => '余额订单', 'value' => $data['balance_amount']],
+            ['name' => '现金订单', 'value' => $data['cash_amount']],
         ];
         return $data;
     }