From 80b257f06de598477ebc6306112f5a712184b1f8 Mon Sep 17 00:00:00 2001 From: wangxinglong <2371974647@qq.com> Date: Mon, 20 Dec 2021 15:02:52 +0800 Subject: [PATCH] settter --- app/controller/api/Coupon.php | 1 + app/controller/manager/Bill.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controller/api/Coupon.php b/app/controller/api/Coupon.php index f1095fb..2ea9017 100644 --- a/app/controller/api/Coupon.php +++ b/app/controller/api/Coupon.php @@ -403,6 +403,7 @@ class Coupon extends Base "coupon_main_id" => $coupon->couponMain->id, "coupon_id" => $coupon->id, "user_code" => $account->user_code, + "business_code" => $business->code, "agency_code" => $business->agency_code, "commission_agency" => $coupon->couponMain->commission_agency, "commission_admin" => $coupon->couponMain->commission_admin, diff --git a/app/controller/manager/Bill.php b/app/controller/manager/Bill.php index 5f7b8cc..c3dde45 100644 --- a/app/controller/manager/Bill.php +++ b/app/controller/manager/Bill.php @@ -18,7 +18,7 @@ class Bill extends Base public function index() { $startTime = input("start_time/s", date("Y-m-d H:i:s", strtotime(date("Y-m-d") . " -1 month"))); - $endTime = input("end_time/s", date("Y-m-d 00:00:00")); + $endTime = input("end_time/s", date("Y-m-d 23:59:59")); if ($this->request->isPost()) { $repo = BillRepository::getInstance(); $keyword = $this->request->param('keyword/s', '');