From 54cb413de1ef4fd662215c5397a8d1eaf57d6882 Mon Sep 17 00:00:00 2001 From: lccsw <805383944@qq.com> Date: Thu, 9 Jun 2022 09:22:08 +0800 Subject: [PATCH] edit-admin-export_biz_settle --- admin/controllers/biz/Settle.php | 2 +- admin/controllers/receiver/orderv2/Orders.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/controllers/biz/Settle.php b/admin/controllers/biz/Settle.php index ccb0c29b..80bb2437 100644 --- a/admin/controllers/biz/Settle.php +++ b/admin/controllers/biz/Settle.php @@ -178,7 +178,7 @@ class Settle extends HD_Controller $biz_id = $this->input->get('id'); $month = $this->input->get('month'); $year = date('Y'); - !$month && $month = intval(date('m')); + !$month && $month = intval(date('m',strtotime("-1 month")));; $where = [ 'biz_id' => $biz_id, 'year' => $year, diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php index ae10d43e..dcca2dcc 100644 --- a/admin/controllers/receiver/orderv2/Orders.php +++ b/admin/controllers/receiver/orderv2/Orders.php @@ -702,7 +702,7 @@ class Orders extends HD_Controller ]; } } - $sum = $this->app_liche_orders_model->sum('total_price', ['o_id'=>$params['id'],'status'=>1,'pay_price>'=>0]); + $sum = $this->app_liche_orders_model->sum('total_price', ['o_id'=>$params['id'],'status'=>1,'pay_price <>'=>0]); $this->data['pay_price'] = $sum['total_price']; $this->data['need_price'] = $this->orders_v2_entity->recevable_price($params['id']); $this->data['list'] = $list;