From c798b8477c0ddde3c52e29bca33fff34ca63d46e Mon Sep 17 00:00:00 2001
From: "sosuke.iwabuchi" <sosuke.iwabuchi@satellite-tech.co.jp>
Date: Tue, 4 Jul 2023 09:18:56 +0900
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E8=A8=88=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/SummaryUse.php  | 29 ++++++++++------------------
 app/Console/Schedules/SummaryUse.php |  3 ++-
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/app/Console/Commands/SummaryUse.php b/app/Console/Commands/SummaryUse.php
index 43b18f2..2e8c60c 100644
--- a/app/Console/Commands/SummaryUse.php
+++ b/app/Console/Commands/SummaryUse.php
@@ -184,16 +184,6 @@ class SummaryUse extends BaseCommand
             return sprintf("%s-%s", $key1 ?? "NULL", $key2 ?? "NULL");
         };
 
-        $targetOrders =  ReceiptIssuingOrder::getBuilder()
-            ->where(ReceiptIssuingOrder::COL_NAME_CONTRACT_ID, $model->contract_id)
-            ->where(ReceiptIssuingOrder::COL_NAME_ORDER_DATETIME, ">=", $from)
-            ->where(ReceiptIssuingOrder::COL_NAME_ORDER_DATETIME, "<", $to);
-
-        $targetMailOrders =  ReceiptIssuingOrder::getBuilder()
-            ->where(ReceiptIssuingOrder::COL_NAME_CONTRACT_ID, $model->contract_id)
-            ->whereNotNull(ReceiptIssuingOrder::COL_NAME_STATUS_ORDER_MAIL_DATETIME)
-            ->where(ReceiptIssuingOrder::COL_NAME_STATUS_ORDER_MAIL_DATETIME, ">=", $from)
-            ->where(ReceiptIssuingOrder::COL_NAME_STATUS_ORDER_MAIL_DATETIME, "<", $to);
 
         // 領収証発行依頼件数の取得
         $receiptIssuingOrders = ReceiptIssuingOrder::getBuilder()
@@ -212,6 +202,7 @@ class SummaryUse extends BaseCommand
                 DB::raw(sprintf("count(*) as count")),
             ])
             ->get();
+
         foreach ($receiptIssuingOrders as $ele) {
 
             $key1 = data_get($ele, ReceiptIssuingOrder::COL_NAME_SUMMARY_KEY1);
@@ -223,7 +214,7 @@ class SummaryUse extends BaseCommand
             $key = $makeKey($key1, $key2);
 
             $summaryByKey = $this->getUseByKeyModel($model, $key1, $key2);
-            $summaryByKey->receipt_order_count += $count;
+            $summaryByKey->receipt_order_count = $count;
 
 
             $summaryByKeys->put($key, $summaryByKey);
@@ -253,7 +244,7 @@ class SummaryUse extends BaseCommand
             $key2 = data_get($ele, ReceiptIssuingOrder::COL_NAME_SUMMARY_KEY2);
             $count = data_get($ele, 'count');
 
-            $model->mail_order_count += $count;
+            $model->mail_order_count = $count;
 
             $key = $makeKey($key1, $key2);
 
@@ -291,8 +282,8 @@ class SummaryUse extends BaseCommand
             $count = data_get($ele, 'count');
             $cost = data_get($ele, 'cost');
 
-            $model->sms_send_count += $count;
-            $model->sms_send_cost += $cost;
+            $model->sms_send_count = $count;
+            $model->sms_send_cost = $cost;
 
             $key = $makeKey($key1, $key2);
 
@@ -396,12 +387,12 @@ class SummaryUse extends BaseCommand
             $summary->is_fixed = true;
         }
 
-
         // 初期設定
-        $summary->receipt_order_count = 0;
-        $summary->mail_order_count = 0;
-        $summary->sms_send_count = 0;
-        $summary->sms_send_cost = 0;
+        // $summary->receipt_order_count = 0;
+        // $summary->mail_order_count = 0;
+        // $summary->sms_send_count = 0;
+        // $summary->sms_send_cost = 0;
+
         return $summary;
     }
 }
diff --git a/app/Console/Schedules/SummaryUse.php b/app/Console/Schedules/SummaryUse.php
index e387fc8..635ed72 100644
--- a/app/Console/Schedules/SummaryUse.php
+++ b/app/Console/Schedules/SummaryUse.php
@@ -11,7 +11,8 @@ class SummaryUse extends BaseSchedule
     static public function register(Schedule $schedule)
     {
         $schedule->command(Command::class, ['--current'])
-            ->everyTenMinutes()
+            // ->everyTenMinutes()
+            ->everyMinute()
             ->description("利用集計(当月)");
         $schedule->command(Command::class)
             ->monthlyOn(5)