diff --git a/app/Domains/Real/Jobs/MongoSyncJob.php b/app/Domains/Real/Jobs/MongoSyncJob.php index 1ede4824..99d5d5c8 100644 --- a/app/Domains/Real/Jobs/MongoSyncJob.php +++ b/app/Domains/Real/Jobs/MongoSyncJob.php @@ -60,7 +60,7 @@ class MongoSyncJob implements ShouldQueue return ; } - $blocs = app(BlocRepository::class)->get()->pluck('id', 'sn')->toArray(); + $blocs = app(BlocRepository::class)->withTrashed()->get()->pluck('id', 'sn')->toArray(); $values = []; diff --git a/app/Domains/Virtual/Commands/Sync/CardSync.php b/app/Domains/Virtual/Commands/Sync/CardSync.php index 8bf60944..4e376cfb 100644 --- a/app/Domains/Virtual/Commands/Sync/CardSync.php +++ b/app/Domains/Virtual/Commands/Sync/CardSync.php @@ -10,7 +10,6 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Artisan; use App\Domains\Virtual\Jobs\CardSyncJob; use App\Domains\Config\Services\ConfigService; -use App\Domains\Card\Repositories\BlocRepository; use App\Domains\Card\Repositories\CardRepository; class CardSync extends Command diff --git a/app/Domains/Virtual/Commands/Sync/LogSync.php b/app/Domains/Virtual/Commands/Sync/LogSync.php index cc826fde..410973b4 100644 --- a/app/Domains/Virtual/Commands/Sync/LogSync.php +++ b/app/Domains/Virtual/Commands/Sync/LogSync.php @@ -11,7 +11,6 @@ use Illuminate\Support\Facades\Artisan; use App\Domains\Virtual\Jobs\LogSyncJob; use App\Domains\Config\Services\ConfigService; use App\Domains\Virtual\Services\ProductService; -use App\Domains\Card\Repositories\BlocRepository; use App\Domains\Card\Repositories\CardRepository; use App\Domains\Virtual\Repositories\PackageRepository; use App\Domains\Virtual\Repositories\ProductRepository; diff --git a/app/Domains/Virtual/Jobs/CardSyncJob.php b/app/Domains/Virtual/Jobs/CardSyncJob.php index 6666bcbc..955eb618 100644 --- a/app/Domains/Virtual/Jobs/CardSyncJob.php +++ b/app/Domains/Virtual/Jobs/CardSyncJob.php @@ -49,7 +49,7 @@ class CardSyncJob implements ShouldQueue { Log::info("CardSyncJob #: maxId {$this->maxId} - page {$this->page}"); - $blocs = app(BlocRepository::class)->get()->pluck('id', 'shorthand')->toArray(); + $blocs = app(BlocRepository::class)->withTrashed()->get()->pluck('id', 'shorthand')->toArray(); $query = DB::connection('vd_old')->table('ckb_custom') ->select(['id', 'custom_no', 'imsi', 'carrieroperator', 'iccid', 'card_number', 'card_from', 'iccid', 'company', 'custom_state', 'create_time' ,'update_time', 'card_cycle_start']) diff --git a/app/Domains/Virtual/Jobs/LogSyncJob.php b/app/Domains/Virtual/Jobs/LogSyncJob.php index 3f3ec99f..8546ce4d 100644 --- a/app/Domains/Virtual/Jobs/LogSyncJob.php +++ b/app/Domains/Virtual/Jobs/LogSyncJob.php @@ -17,7 +17,6 @@ use App\Domains\Config\Services\ConfigService; use App\Domains\Virtual\Commands\Sync\LogSync; use App\Domains\Virtual\Services\CommonService; use App\Domains\Virtual\Services\ProductService; -use App\Domains\Card\Repositories\BlocRepository; use App\Domains\Card\Repositories\CardRepository; use App\Domains\Virtual\Repositories\OrderRepository; use App\Domains\Virtual\Repositories\CompanyRepository; diff --git a/app/Models/Card/Bloc.php b/app/Models/Card/Bloc.php index a6cd9508..b001299f 100644 --- a/app/Models/Card/Bloc.php +++ b/app/Models/Card/Bloc.php @@ -3,6 +3,7 @@ namespace App\Models\Card; use App\Core\Model; +use Illuminate\Database\Eloquent\SoftDeletes; /** * App\Models\Card\Bloc @@ -31,6 +32,8 @@ use App\Core\Model; */ class Bloc extends Model { + use SoftDeletes; + protected $table = 'blocs'; public function cards()