Browse Source

集計の日付バグ修正

develop
sosuke.iwabuchi 2 years ago
parent
commit
5aa08e05d1
2 changed files with 7 additions and 3 deletions
  1. +2
    -0
      app/Repositories/Custom/HelloTechno/ReceiptIssuingOrderRepository.php
  2. +5
    -3
      app/Repositories/UseSummaryRepository.php

+ 2
- 0
app/Repositories/Custom/HelloTechno/ReceiptIssuingOrderRepository.php View File

@@ -107,11 +107,13 @@ class ReceiptIssuingOrderRepository extends BaseRepository
// 受付日時
$orderDateFrom = data_get($condition, static::CONDITION_ORDER_DATE_FROM);
if ($orderDateFrom instanceof Carbon) {
$orderDateFrom = $orderDateFrom->clone();
$orderDateFrom->setTime(0, 0);
$table->where($this->makeColumnName([static::TABLE_ORDER, ReceiptIssuingOrder::COL_NAME_ORDER_DATETIME]), '>=', $orderDateFrom);
}
$orderDateTo = data_get($condition, static::CONDITION_ORDER_DATE_TO);
if ($orderDateTo instanceof Carbon) {
$orderDateTo = $orderDateTo->clone();
$orderDateTo->setTime(0, 0)->addDay();
$table->where($this->makeColumnName([static::TABLE_ORDER, ReceiptIssuingOrder::COL_NAME_ORDER_DATETIME]), '<=', $orderDateTo);
}


+ 5
- 3
app/Repositories/UseSummaryRepository.php View File

@@ -26,6 +26,7 @@ class UseSummaryRepository extends BaseRepository

protected Carbon $dateFrom;
protected Carbon $dateTo;
protected Carbon $dateToOrigin;

/**
* コレクションを取得する
@@ -49,8 +50,9 @@ class UseSummaryRepository extends BaseRepository
if (!($dateFrom instanceof Carbon) || !($dateTo instanceof Carbon)) {
throw new AppCommonException('検索日付不正');
}
$this->dateFrom = $dateFrom;
$this->dateTo = $dateTo->addDay();
$this->dateFrom = $dateFrom->clone();
$this->dateToOrigin = $dateTo->clone();
$this->dateTo = $dateTo->clone()->addDay();

$target = ReceiptIssuingOrder::getBuilder(self::TABLE_TARGET);

@@ -137,7 +139,7 @@ class UseSummaryRepository extends BaseRepository
$summary = self::TABLE_SUMMARY;
$columns = [
SelectQueryUtil::value($this->dateFrom->format('Y/m/d'), 'date_from'),
SelectQueryUtil::value($this->dateTo->format('Y/m/d'), 'date_to'),
SelectQueryUtil::value($this->dateToOrigin->format('Y/m/d'), 'date_to'),
SelectQueryUtil::select([$summary, 'receipt_order_count'])->build(),
SelectQueryUtil::select([$summary, 'mail_order_count'])->build(),
SelectQueryUtil::select([$sms, 'sms_send_count'])->nullValue(0)->build(),


Loading…
Cancel
Save