From ded87e722ba2977dcb58dbd9e502e1a65451026c Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 13 Mar 2024 15:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderRepository.php    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 31029369..0741cf0c 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -2444,20 +2444,22 @@ class StoreOrderRepository extends BaseRepository
     {
         $uid = Merchant::getDB()->where(['mer_id'=>$merId,'is_del'=>0])->value('uid');
         $data = StoreOrder::getDB()->alias('o')
-            ->leftJoin('Merchant m', 'o.mer_id = m.mer_id')
-            ->leftJoin('User u', 'o.mer_id = m.mer_id');
+            ->leftJoin('Merchant m', 'o.mer_id = m.mer_id');
         if (isset($where['section_startTime']) && $where['section_startTime'] && isset($where['section_endTime']) && $where['section_endTime']) {
+//            $data->where('o.create_time', '>', $where['section_startTime'])->where('o.create_time', '<', $where['section_endTime']);
             $data->whereTime('o.create_time', 'between', [$where['section_startTime'], $where['section_endTime']]);
         }
         $data->where(function ($query) use ($where,$uid,$merId) {
             $query->where('o.mer_id', $merId)->whereOr('o.uid', $uid);
         })->where('o.source', 999);//只要扫码
-        $data->field('o.order_id,o.uid,o.mer_id,o.pay_price,m.mer_name,o.create_time,u.nickname');
+        $data->field('o.order_id,o.uid,o.mer_id,o.pay_price,m.mer_name,o.create_time');
         $list = $data->order('o.create_time DESC')->page($page, $limit)->select();
         $income = 0;
         $outcome = 0;
+
         foreach ($list as &$value){
             if($value['mer_id'] == $merId){
+                $value['nickname'] = User::getDB()->where(['uid'=>$value['uid']])->value('nickname');
                 $value['msg'] = "收入";
                 $income +=$value['pay_price'];
                 $value['come_msg'] = "来自".$value['nickname'];
@@ -2467,7 +2469,6 @@ class StoreOrderRepository extends BaseRepository
                 $value['come_msg'] = "给".$value['mer_name'];
             }
         }
-
         return compact('income','outcome','list');
     }