退货优化

app/Domains/Real/Commands/Sync/OrderBaseSync.php

@@ -151,13 +151,24 @@ class OrderBaseSync extends Command
         $endtime = $datetime->copy()->endOfMonth()->endOfDay()->format('Y-m-d H:i:s');
 
         $refunds = DB::connection('real')->table('jxc_back_card')
-        ->select(['sim', 'create_time'])
+            ->select(['sim', 'create_time'])
-        ->where('status', 2)
+            ->where('status', 2)
-        ->where('create_time', '>=', $starttime)
+            ->where('create_time', '>=', $starttime)
-        ->where('create_time', '<=', $endtime)
+            ->where('create_time', '<=', $endtime)
-        ->get()->collect()->keyBy('sim')->toArray();
+            ->orderBy('create_time')
+            ->get()->collect()->toArray();
 
-        return $refunds;
+
+        $array = [];
+
+        foreach ($refunds as $item) {
+            $simArray = str_to_array($item['sim'], ',');
+            foreach ($simArray as $sim) {
+                $array[$sim] = $item['create_time'];
+            }
+        }
+
+        return $array;
     }
 
     // 获取月销售卡数据
@@ -177,6 +188,8 @@ class OrderBaseSync extends Command
                 $sim = explode('-', $value['section_no'])[0];
                 $order = $orders[$item['o_number']];
 
+                $refunded_at = isset($refunds[$sim]) ? (strtotime($refunds[$sim]) >= strtotime($order['created_at']) ? $refunds[$sim] : null) : null;
+
                 for ($i=0; $i < $value['counts']; $i++) {
                     $cards[] = [
                         'type' => 0,
@@ -186,7 +199,7 @@ class OrderBaseSync extends Command
                         'package_id' => $order['package_id'],
                         'counts' => 1,
                         'unit_price' => $order['unit_price'],
-                        'refunded_at' => $refunds[$sim]['create_time'] ?? null,
+                        'refunded_at' => $refunded_at,
                         'created_at' => $order['created_at'],
                         'updated_at' => $order['updated_at'],
                         'deleted_at' => $order['deleted_at'],