From 7936a1305073d4d5f6f9d3a95ff59809a72cb9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Fri, 1 Apr 2022 09:54:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=9C=9F=E8=BF=9B?= =?UTF-8?q?=E8=B4=A7=E4=B8=9A=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dealer/CalculatePurchaseAmountOfCurrentPeriod.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Actions/Dealer/CalculatePurchaseAmountOfCurrentPeriod.php b/app/Actions/Dealer/CalculatePurchaseAmountOfCurrentPeriod.php index 0396f595..d4d86243 100644 --- a/app/Actions/Dealer/CalculatePurchaseAmountOfCurrentPeriod.php +++ b/app/Actions/Dealer/CalculatePurchaseAmountOfCurrentPeriod.php @@ -22,11 +22,9 @@ class CalculatePurchaseAmountOfCurrentPeriod $tz = now(); if ($tz->day >= 20) { - // 上月20号-当月19号的进货业绩 - $startAt = $tz->copy()->subMonthNoOverflow()->setDay(20)->startOfDay(); + $startAt = $tz->setDay(20)->startOfDay(); } else { - // 上上月20号-上月19号的进货业绩 - $startAt = $tz->copy()->subMonthsNoOverflow(2)->setDay(20)->startOfDay(); + $startAt = $tz->subMonthNoOverflow()->setDay(20)->startOfDay(); } return bcmul($this->calculatePurchaseAmount->handle($dealer, $startAt), '1', 2);