From 11628d38d3f4734dacf807b4603b605aea46f725 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 13 Mar 2024 15:23:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=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 | 7 +++++-- app/controller/api/server/StoreOrder.php | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index fa35350c..31029369 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2444,14 +2444,15 @@ 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('Merchant m', 'o.mer_id = m.mer_id') + ->leftJoin('User u', 'o.mer_id = m.mer_id'); if (isset($where['section_startTime']) && $where['section_startTime'] && isset($where['section_endTime']) && $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'); + $data->field('o.order_id,o.uid,o.mer_id,o.pay_price,m.mer_name,o.create_time,u.nickname'); $list = $data->order('o.create_time DESC')->page($page, $limit)->select(); $income = 0; $outcome = 0; @@ -2459,9 +2460,11 @@ class StoreOrderRepository extends BaseRepository if($value['mer_id'] == $merId){ $value['msg'] = "收入"; $income +=$value['pay_price']; + $value['come_msg'] = "来自".$value['nickname']; }else{ $value['msg'] = "支出"; $outcome +=$value['pay_price']; + $value['come_msg'] = "给".$value['mer_name']; } } diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php index 026c4921..f423f125 100644 --- a/app/controller/api/server/StoreOrder.php +++ b/app/controller/api/server/StoreOrder.php @@ -68,10 +68,10 @@ class StoreOrder extends BaseController [$page, $limit] = $this->getPage(); $where['section_startTime'] = $this->request->param('section_startTime'); $where['section_endTime'] = $this->request->param('section_endTime'); - if(empty($where['section_startTime']) && empty($where['section_endTime'])){ - $where['section_startTime'] = date('Y-m-d',time()).' 00:00:00'; - $where['section_endTime'] = date('Y-m-d',time()).' 23:59:59'; - } +// if(empty($where['section_startTime']) && empty($where['section_endTime'])){ +// $where['section_startTime'] = date('Y-m-d',time()).' 00:00:00'; +// $where['section_endTime'] = date('Y-m-d',time()).' 23:59:59'; +// } return app('json')->success($repository->revenueExpenditure($where, $page, $limit,$merId)); } 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 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=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'); } From 337f3f4bf89079954cb3a99cdc1d80a7cef0232c Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 13 Mar 2024 15:55:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BC=A0=E5=A6=82?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/server/StoreOrder.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php index f423f125..63eb2ec3 100644 --- a/app/controller/api/server/StoreOrder.php +++ b/app/controller/api/server/StoreOrder.php @@ -68,10 +68,10 @@ class StoreOrder extends BaseController [$page, $limit] = $this->getPage(); $where['section_startTime'] = $this->request->param('section_startTime'); $where['section_endTime'] = $this->request->param('section_endTime'); -// if(empty($where['section_startTime']) && empty($where['section_endTime'])){ -// $where['section_startTime'] = date('Y-m-d',time()).' 00:00:00'; -// $where['section_endTime'] = date('Y-m-d',time()).' 23:59:59'; -// } + if(!empty($where['section_endTime'])&& $where['section_endTime']){ + $timestamp = strtotime($where['section_endTime'] . ' +1 day'); + $where['section_endTime'] = date('Y-m-d', $timestamp); + } return app('json')->success($repository->revenueExpenditure($where, $page, $limit,$merId)); } From 9d222a8c87011412e70d285248c37aaf7f2df3d6 Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 13 Mar 2024 16:24:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/store/order/StoreOrderRepository.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 0741cf0c..5ea2353c 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2469,6 +2469,9 @@ class StoreOrderRepository extends BaseRepository $value['come_msg'] = "给".$value['mer_name']; } } + $income = sprintf("%.2f", $income); + $outcome = sprintf("%.2f", $outcome); + return compact('income','outcome','list'); }