youfeng

app/Service/TPlusServerService.php

@@ -793,6 +793,7 @@ class TPlusServerService extends Service
             ->select([
                 'employee_id_1',
                 'employee_id_1_title',
+                'order_time as time',
                 DB::raw("DATE_FORMAT(FROM_UNIXTIME(order_time), '%Y-%m-01') as order_time"),
                 DB::raw("SUM(payment_amount) as payment_amount"),
                 DB::raw("SUM(CASE WHEN is_activity = 0 THEN payment_amount ELSE 0 END) as payment_amount_not_include_activity"),
@@ -827,6 +828,7 @@ class TPlusServerService extends Service
                     $dataArray[$key]['should_pay'] = bcadd(bcadd($value['index_' . EmployeeIndex::TYPE_EIGHT], $pay_in_advance,2),$value['index_' . EmployeeIndex::TYPE_SIX],2);
 
                     unset($dataArray[$key]['fake_id']);
+                    unset($dataArray[$key]['time']);
                 }
 
                 DB::table($this->table_2)->insert($dataArray);
@@ -851,8 +853,8 @@ class TPlusServerService extends Service
         }
 
         // 取出所有涉及的 employee_id 和时间区间
-        $employeeIds = array_column($existingData, 'employee_id_2');
-        $time = array_column($existingData, 'order_time');
+        $employeeIds = array_column($existingData, 'employee_id_1');
+        $time = array_column($existingData, 'time');
         $minStart = ! empty($time) ? min($time) : 0;
         $maxEnd   = ! empty($time) ? max($time) : 0;
 
@@ -872,8 +874,8 @@ class TPlusServerService extends Service
         // 找到所有符合条件的 index（可能多个 type）
         $matchedIndexes = $indexes->filter(function ($item) use ($value) {
             return $item['employee_id'] == $value['employee_id_1']
-                && $item['start_time'] <= $value['end_time']
-                && $item['end_time'] >= $value['start_time'];
+                && $item['start_time'] <= $value['time']
+                && $item['end_time'] >= $value['time'];
         });
         // 按 type 去重，只保留第一次出现的
         $uniqueByType = [];