diff --git a/app/Actions/Dealer/CalculatePurchaseAmountOfCurrentPeriod.php b/app/Actions/Dealer/CalculatePurchaseAmountOfCurrentPeriod.php index 03c32b68..0396f595 100644 --- a/app/Actions/Dealer/CalculatePurchaseAmountOfCurrentPeriod.php +++ b/app/Actions/Dealer/CalculatePurchaseAmountOfCurrentPeriod.php @@ -22,11 +22,11 @@ class CalculatePurchaseAmountOfCurrentPeriod $tz = now(); if ($tz->day >= 20) { - $startAt = $tz->copy()->setDay(20)->startOfDay(); - } elseif ($tz->day >= 5) { - $startAt = $tz->copy()->setDay(5)->startOfDay(); - } else { + // 上月20号-当月19号的进货业绩 $startAt = $tz->copy()->subMonthNoOverflow()->setDay(20)->startOfDay(); + } else { + // 上上月20号-上月19号的进货业绩 + $startAt = $tz->copy()->subMonthsNoOverflow(2)->setDay(20)->startOfDay(); } return bcmul($this->calculatePurchaseAmount->handle($dealer, $startAt), '1', 2);