Merge branch 'master' of /mnt/git/v2.tiantianxinye.365care

app/Console/Commands/FixOrderItemsPaidAt.php

@@ -66,9 +66,11 @@ class FixOrderItemsPaidAt extends Command
         $this->info("目标时间点：{$serviceDateEnd}");
 
         // 查询需要修复的记录
+        // 条件：paid_at 的日期晚于 service_date，且不在同一月份
         $items = OrderItems::where('service_date', $serviceDateStr)
             ->whereNotNull('paid_at')
             ->whereRaw("DATE(`paid_at`) > '{$serviceDateStr}'")
+            ->whereRaw("DATE_FORMAT(`paid_at`, '%Y-%m') > DATE_FORMAT('{$serviceDateStr}', '%Y-%m')")
             ->where('total', '>', 0)
             ->with(['order' => function ($query) {
                 $query->select('id', 'customer_id');