重构方法名 ByDay

app/Services/NewOrderCountingRecordService.php

@@ -61,7 +61,7 @@ class NewOrderCountingRecordService
     {
         $result = [];
         $unQueryCondition = [];
-        $dataByDayFromCache = collect();
+        $dataFromCache = collect();
         $queryCondition = $this->dateUtils($start, $end, $unit);
         foreach ($queryCondition as $dateStr => $ownerIds) {
             foreach ($ownerIds as $ownerId) {
@@ -71,16 +71,16 @@ class NewOrderCountingRecordService
                     if (empty($unQueryCondition[$dateStr])) $unQueryCondition[$dateStr] = [];
                     $unQueryCondition[$dateStr][] = $ownerId;
                 } else {
-                    $dataByDayFromCache = $dataByDayFromCache->concat($items);
+                    $dataFromCache = $dataFromCache->concat($items);
                 }
             }
         }
-        $result['dataByDayFromCache'] = $dataByDayFromCache;
+        $result['dataFromCache'] = $dataFromCache;
         $result['unQueryCondition'] = $unQueryCondition;
         return $result;
     }
 
-    public function dataByDayFromMiddleTable($unQueryCondition, $unit)
+    public function dataFromMiddleTable($unQueryCondition, $unit)
     {
         $result = [];
         $orderSqlBuilder = OrderCountingRecord::query();
@@ -89,32 +89,32 @@ class NewOrderCountingRecordService
                 $query->whereIn('owner_id', $owners)->where('date_target', $date)->where('counting_unit', $unit);
             });
         }
-        $dataByDayFromMiddleTable = $orderSqlBuilder->get();
-        $this->insertIntoCache($dataByDayFromMiddleTable, $unit);
+        $dataFromMiddleTable = $orderSqlBuilder->get();
+        $this->insertIntoCache($dataFromMiddleTable, $unit);
 
-        $unQueryCondition = $this->unQueryCondition($dataByDayFromMiddleTable, $unQueryCondition);
+        $unQueryCondition = $this->unQueryCondition($dataFromMiddleTable, $unQueryCondition);
         $result['unQueryCondition'] = $unQueryCondition;
-        $result['dataByDayFromMiddleTable'] = $dataByDayFromMiddleTable;
+        $result['dataFromMiddleTable'] = $dataFromMiddleTable;
         return $result;
     }
 
     public function orderCountingRecordsDay($start, $end, $unit)
     {
-        $dataByDayFromCacheResult = $this->dataFromCache($start, $end, $unit);
-        $dataByDayFromCache = $dataByDayFromCacheResult['dataByDayFromCache'];
-        $unQueryCondition = $dataByDayFromCacheResult['unQueryCondition'];
+        $dataFromCacheResult = $this->dataFromCache($start, $end, $unit);
+        $dataFromCache = $dataFromCacheResult['dataFromCache'];
+        $unQueryCondition = $dataFromCacheResult['unQueryCondition'];
         if (!empty($unQueryCondition)) {
-            $dataByDayFromMiddleTableResult = $this->dataByDayFromMiddleTable($unQueryCondition, $unit);
-            $dataByDayFromMiddleTable = $dataByDayFromMiddleTableResult['dataByDayFromMiddleTable'];
-            $unQueryCondition = $dataByDayFromMiddleTableResult['unQueryCondition'];
+            $dataFromMiddleTableResult = $this->dataFromMiddleTable($unQueryCondition, $unit);
+            $dataFromMiddleTable = $dataFromMiddleTableResult['dataFromMiddleTable'];
+            $unQueryCondition = $dataFromMiddleTableResult['unQueryCondition'];
             if (!empty($unQueryCondition)) {
-                $dataByDayFromOrder = $this->dataByDayFromOrder($unQueryCondition, $unit);
+                $dataFromOrder = $this->dataFromOrder($unQueryCondition, $unit);
             }
         }
-        $dataByDayFromCache = $dataByDayFromCache ?? collect();
-        $dataByDayFromMiddleTable = $dataByDayFromMiddleTable ?? collect();
-        $dataByDayFromOrder = $dataByDayFromOrder ?? collect();
-        return $dataByDayFromCache->concat($dataByDayFromMiddleTable)->concat($dataByDayFromOrder);
+        $dataFromCache = $dataFromCache ?? collect();
+        $dataFromMiddleTable = $dataFromMiddleTable ?? collect();
+        $dataFromOrder = $dataFromOrder ?? collect();
+        return $dataFromCache->concat($dataFromMiddleTable)->concat($dataFromOrder);
     }
 
     public function dateUtils($start, $end, $unit)
@@ -148,7 +148,7 @@ class NewOrderCountingRecordService
         return $dataArray;
     }
 
-    public function dataByDayFromOrder($unQueryCondition, $unit)
+    public function dataFromOrder($unQueryCondition, $unit)
     {
         $orderSqlBuilder = Order::query()->selectRaw("owner_id,warehouse_id,shop_id,logistic_id,count(1) as amounts ,DATE_FORMAT(created_at,'%Y-%m-%d') as date_target");
         foreach ($unQueryCondition as $dateStr => $ownerIds) {
@@ -156,12 +156,12 @@ class NewOrderCountingRecordService
                 $query->whereIn('owner_id', $ownerIds)->where('created_at', '>', $dateStr)->where('created_at', '<', Carbon::parse($dateStr)->addDay()->toDateString())->where('wms_status', '订单完成');
             });
         }
-        $dataByDayFromOrder = $orderSqlBuilder->groupBy(['owner_id', 'warehouse_id', 'shop_id', 'logistic_id', 'date_target'])->get();
+        $dataFromOrder = $orderSqlBuilder->groupBy(['owner_id', 'warehouse_id', 'shop_id', 'logistic_id', 'date_target'])->get();
 
-        $dataByDayFromMiddleTable = $this->ordersToOrderCountingRecords($dataByDayFromOrder);
-        $this->insertIntoMiddleTable($dataByDayFromMiddleTable, $unit);
-        $this->insertIntoCache($dataByDayFromMiddleTable, $unit);
-        return $dataByDayFromMiddleTable;
+        $dataFromMiddleTable = $this->ordersToOrderCountingRecords($dataFromOrder);
+        $this->insertIntoMiddleTable($dataFromMiddleTable, $unit);
+        $this->insertIntoCache($dataFromMiddleTable, $unit);
+        return $dataFromMiddleTable;
     }
 
     public function orderCountingRecordsWeek($start, $end, $unit)
@@ -217,10 +217,10 @@ class NewOrderCountingRecordService
     }
 
 
-    public function unQueryCondition($dataByDayFromMiddleTable, $unQueryCondition)
+    public function unQueryCondition($dataFromMiddleTable, $unQueryCondition)
     {
         $map = [];
-        $dataByDayFromMiddleTable->each(function ($item) use (&$map) {
+        $dataFromMiddleTable->each(function ($item) use (&$map) {
             $key = 'owner_id=' . $item->owner_id . ' date_target' . $item->date_target;
             $map[$key] = true;
         });
@@ -237,13 +237,13 @@ class NewOrderCountingRecordService
     }
 
 
-    public function ordersToOrderCountingRecords($dataByDayFromOrder)
+    public function ordersToOrderCountingRecords($dataFromOrder)
     {
-        $dataByDayFromMiddleTable = collect();
+        $dataFromMiddleTable = collect();
         //当日当周当月当年的数据不能插入到中间表
         $dateTime = Carbon::now()->toDateTimeString();
-        foreach ($dataByDayFromOrder as $order) {
-            $dataByDayFromMiddleTable->push(new OrderCountingRecord([
+        foreach ($dataFromOrder as $order) {
+            $dataFromMiddleTable->push(new OrderCountingRecord([
                 'owner_id' => $order->owner_id,
                 'shop_id' => $order->shop_id,
                 'warehouse_id' => $order->warehouse_id,
@@ -255,7 +255,7 @@ class NewOrderCountingRecordService
                 'updated_at' => $dateTime,
             ]));
         }
-        return $dataByDayFromMiddleTable;
+        return $dataFromMiddleTable;
     }
 
 }

tests/Services/NewOrderCountingRecordService/NewOrderCountingRecordServiceTest.php

@@ -56,7 +56,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function orderCountingRecords_remember()
+    public function orderCountingRecords_remember_day()
     {
         $start = Carbon::now()->subDays(2)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -73,7 +73,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function dataByDayFromCache_all()
+    public function dataFromCache_all_day()
     {
         $start = Carbon::now()->subDays(2)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -87,13 +87,13 @@ class NewOrderCountingRecordServiceTest extends TestCase
             }
         }
         $result = $this->newOrderCountingRecordService->dataFromCache($start, $end, $unit);
-        $this->assertCount(6, $result['dataByDayFromCache']);
+        $this->assertCount(6, $result['dataFromCache']);
     }
 
     /**
      * @test
      */
-    public function dataByDayFromCache_empty()
+    public function dataFromCache_empty_day()
     {
         $start = Carbon::now()->subDays(2)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -110,7 +110,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function dataByDayFromMiddleTable_all()
+    public function dataFromMiddleTable_all_day()
     {
         $start = Carbon::now()->subDays(1)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -122,9 +122,9 @@ class NewOrderCountingRecordServiceTest extends TestCase
         factory(OrderCountingRecord::class)->times(2)->create(['date_target' => Carbon::now()->subDays(1)->toDateString(), 'owner_id' => $owner1->id]);
         factory(OrderCountingRecord::class)->times(2)->create(['date_target' => Carbon::now()->subDays(1)->toDateString(), 'owner_id' => $owner2->id]);
         $dateArray = $this->newOrderCountingRecordService->dateUtils($start, $end, $unit);
-        $result = $this->newOrderCountingRecordService->dataByDayFromMiddleTable($dateArray, $unit);
+        $result = $this->newOrderCountingRecordService->dataFromMiddleTable($dateArray, $unit);
 
-        $this->assertCount(8, $result['dataByDayFromMiddleTable']);
+        $this->assertCount(8, $result['dataFromMiddleTable']);
         $this->assertCount(0, $result['unQueryCondition'][Carbon::now()->toDateString()]);
         $this->assertCount(0, $result['unQueryCondition'][Carbon::now()->subDays(1)->toDateString()]);
     }
@@ -132,7 +132,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function dataByDayFromMiddleTable_empty()
+    public function dataFromMiddleTable_empty_day()
     {
         $start = Carbon::now()->subDays(1)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -141,9 +141,9 @@ class NewOrderCountingRecordServiceTest extends TestCase
         $owner2 = factory(Owner::class)->create();
 
         $dateArray = $this->newOrderCountingRecordService->dateUtils($start, $end, $unit);
-        $result = $this->newOrderCountingRecordService->dataByDayFromMiddleTable($dateArray, $unit);
+        $result = $this->newOrderCountingRecordService->dataFromMiddleTable($dateArray, $unit);
 
-        $this->assertCount(0, $result['dataByDayFromMiddleTable']);
+        $this->assertCount(0, $result['dataFromMiddleTable']);
         $this->assertCount(2, $result['unQueryCondition'][Carbon::now()->toDateString()]);
         $this->assertCount(2, $result['unQueryCondition'][Carbon::now()->subDays(1)->toDateString()]);
     }
@@ -151,7 +151,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function dataByDayFromMiddleTable_common()
+    public function dataFromMiddleTable_common_day()
     {
         $start = Carbon::now()->subDays(1)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -162,9 +162,9 @@ class NewOrderCountingRecordServiceTest extends TestCase
         $dateArray = $this->newOrderCountingRecordService->dateUtils($start, $end, $unit);
         factory(OrderCountingRecord::class)->times(2)->create(['date_target' => Carbon::now()->toDateString(), 'owner_id' => $owner1->id]);
 
-        $result = $this->newOrderCountingRecordService->dataByDayFromMiddleTable($dateArray, $unit);
+        $result = $this->newOrderCountingRecordService->dataFromMiddleTable($dateArray, $unit);
 
-        $this->assertCount(2, $result['dataByDayFromMiddleTable']);
+        $this->assertCount(2, $result['dataFromMiddleTable']);
         $this->assertCount(1, $result['unQueryCondition'][Carbon::now()->toDateString()]);
         $this->assertCount(2, $result['unQueryCondition'][Carbon::now()->subDays(1)->toDateString()]);
     }
@@ -172,7 +172,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function insertIntoCache()
+    public function insertIntoCache_day()
     {
         $start = Carbon::now()->subDays(1)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -183,9 +183,9 @@ class NewOrderCountingRecordServiceTest extends TestCase
         $dateArray = $this->newOrderCountingRecordService->dateUtils($start, $end, $unit);
         $orderCountingRecord = factory(OrderCountingRecord::class)->times(2)->create(['date_target' => Carbon::now()->toDateString(), 'owner_id' => $owner1->id]);
 
-        $result = $this->newOrderCountingRecordService->dataByDayFromMiddleTable($dateArray, $unit);
+        $result = $this->newOrderCountingRecordService->dataFromMiddleTable($dateArray, $unit);
 
-        $this->newOrderCountingRecordService->insertIntoCache($result['dataByDayFromMiddleTable'], $unit);
+        $this->newOrderCountingRecordService->insertIntoCache($result['dataFromMiddleTable'], $unit);
         $key = 'order_counting_records_' . Carbon::now()->toDateString() . '_' . $owner1->id . '_' . $unit;
         $this->assertNotNull(cache()->get($key));
         $this->assertNotNull($orderCountingRecord->toArray());
@@ -195,7 +195,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function dataByDayFromOrder()
+    public function dataFromOrder_day()
     {
         $start = Carbon::now()->subDays(1)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -211,7 +211,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
         factory(Order::class)->times(3)->create(['wms_status' => '订单完成', 'created_at' => Carbon::now()->subDays(1), 'owner_id' => $owner1->id]);
         factory(Order::class)->times(4)->create(['wms_status' => '订单完成', 'created_at' => Carbon::now()->subDays(1), 'owner_id' => $owner2->id]);
 
-        $result = $this->newOrderCountingRecordService->dataByDayFromOrder($unQueryCondition, $unit);
+        $result = $this->newOrderCountingRecordService->dataFromOrder($unQueryCondition, $unit);
         $this->assertEquals(1, $result->where('date_target', Carbon::now()->toDateString())->where('owner_id', $owner1->id)->first()->amount);
         $this->assertEquals(2, $result->where('date_target', Carbon::now()->toDateString())->where('owner_id', $owner2->id)->first()->amount);
         $this->assertEquals(3, $result->where('date_target', Carbon::now()->subDays(1)->toDateString())->where('owner_id', $owner1->id)->first()->amount);
@@ -221,7 +221,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function dataByDayFromOrder_insertMiddleTable()
+    public function dataFromOrder_insertMiddleTable_day()
     {
         $start = Carbon::now()->subDays(1)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -237,7 +237,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
         factory(Order::class)->times(3)->create(['wms_status' => '订单完成', 'created_at' => Carbon::now()->subDays(1), 'owner_id' => $owner1->id]);
         factory(Order::class)->times(4)->create(['wms_status' => '订单完成', 'created_at' => Carbon::now()->subDays(1), 'owner_id' => $owner2->id]);
 
-        $this->newOrderCountingRecordService->dataByDayFromOrder($unQueryCondition, $unit);
+        $this->newOrderCountingRecordService->dataFromOrder($unQueryCondition, $unit);
         //当天的数据不入中间表
         $this->assertCount(0, OrderCountingRecord::query()->where('date_target', Carbon::now()->toDateString())->get());
         $this->assertCount(2, OrderCountingRecord::query()->where('date_target', Carbon::now()->subDays(1)->toDateString())->get());
@@ -247,7 +247,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function dataByDayFromOrder_insertCache()
+    public function dataFromOrder_insertCache_day()
     {
         $start = Carbon::now()->subDays(1)->toDateString();
         $end = Carbon::now()->toDateString();
@@ -263,7 +263,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
         factory(Order::class)->times(3)->create(['wms_status' => '订单完成', 'created_at' => Carbon::now()->subDays(1), 'owner_id' => $owner1->id]);
         factory(Order::class)->times(4)->create(['wms_status' => '订单完成', 'created_at' => Carbon::now()->subDays(1), 'owner_id' => $owner2->id]);
 
-        $this->newOrderCountingRecordService->dataByDayFromOrder($unQueryCondition, $unit);
+        $this->newOrderCountingRecordService->dataFromOrder($unQueryCondition, $unit);
         $key1 = 'order_counting_records_' . Carbon::now()->toDateString() . '_' . $owner1->id . '_' . $unit;
         $key2 = 'order_counting_records_' . Carbon::now()->toDateString() . '_' . $owner2->id . '_' . $unit;
         $key3 = 'order_counting_records_' . Carbon::now()->subDays(1)->toDateString() . '_' . $owner1->id . '_' . $unit;
@@ -277,7 +277,7 @@ class NewOrderCountingRecordServiceTest extends TestCase
     /**
      * @test
      */
-    public function orderCountingRecordsDay()
+    public function orderCountingRecordsDay_day()
     {
         $start = Carbon::now()->subDays(1)->toDateString();
         $end = Carbon::now()->toDateString();