diff --git a/app/Domains/Virtual/Commands/Sync/PackageSync.php b/app/Domains/Virtual/Commands/Sync/PackageSync.php index e8078a71..66b2c65a 100644 --- a/app/Domains/Virtual/Commands/Sync/PackageSync.php +++ b/app/Domains/Virtual/Commands/Sync/PackageSync.php @@ -26,6 +26,10 @@ class PackageSync extends Command $packages = array_merge($basePackages, $renewalPackages, $flowPackages); + foreach ($packages as &$item) { + $item['id'] = ($item['type'] + 1) * 1000000 + $item['id']; + } + Package::upsert($packages, 'id'); app(PackageRepository::class)->forgetCached(); @@ -38,7 +42,8 @@ class PackageSync extends Command return $packages->map(function ($item) { return [ - 'id' => $item->package_sn, + 'id' => $item->id, + 'sn' => $item->package_sn, 'name' => $item->name, 'type' => 0, 'carrier_operator' => self::$carrier_operator[$item->carrieroperator], @@ -53,8 +58,9 @@ class PackageSync extends Command 'effect_months' => 0, 'delay_months' => 0, 'description' => $item->description ?: '', - 'updated_at' => date('Y-m-d H:i:s'), - 'deleted_at' => $item->del ? date('Y-m-d H:i:s') : null, + 'created_at' => date('Y-m-d H:i:s', $item->create_time), + 'updated_at' => date('Y-m-d H:i:s', $item->update_time), + 'deleted_at' => $item->del ? date('Y-m-d H:i:s', $item->update_time) : null, ]; }); } @@ -66,7 +72,8 @@ class PackageSync extends Command return $packages->map(function ($item) { return [ - 'id' => $item->package_sn, + 'id' => $item->id, + 'sn' => $item->package_sn, 'name' => $item->package_name, 'type' => 1, 'carrier_operator' => self::$carrier_operator[$item->operator], @@ -81,8 +88,9 @@ class PackageSync extends Command 'effect_months' => ($item->buy_enabled == 10) ? 0 : 1, 'delay_months' => ($item->service_extend == 10) ? 1 : 0, 'description' => $item->package_text ?: '', - 'updated_at' => date('Y-m-d H:i:s'), - 'deleted_at' => $item->del ? date('Y-m-d H:i:s') : null, + 'created_at' => date('Y-m-d H:i:s', $item->create_time), + 'updated_at' => date('Y-m-d H:i:s', $item->update_time), + 'deleted_at' => $item->del ? date('Y-m-d H:i:s', $item->update_time) : null, ]; }); } @@ -94,7 +102,8 @@ class PackageSync extends Command return $packages->map(function ($item) { return [ - 'id' => $item->package_sn, + 'id' => $item->id, + 'sn' => $item->package_sn, 'name' => $item->package_name, 'type' => 2, 'carrier_operator' => self::$carrier_operator[$item->operator], @@ -109,8 +118,9 @@ class PackageSync extends Command 'effect_months' => ($item->buy_enabled == 10) ? 0 : 1, 'delay_months' => ($item->service_extend == 10) ? 1 : 0, 'description' => $item->package_text ?: '', - 'updated_at' => date('Y-m-d H:i:s'), - 'deleted_at' => $item->del ? date('Y-m-d H:i:s') : null, + 'created_at' => date('Y-m-d H:i:s', $item->create_time), + 'updated_at' => date('Y-m-d H:i:s', $item->update_time), + 'deleted_at' => $item->del ? date('Y-m-d H:i:s', $item->update_time) : null, ]; }); }