diff --git a/app/Domains/Card/Repositories/BlocRepository.php b/app/Domains/Card/Repositories/BlocRepository.php index 8b9422de..c6fb5d99 100644 --- a/app/Domains/Card/Repositories/BlocRepository.php +++ b/app/Domains/Card/Repositories/BlocRepository.php @@ -16,7 +16,7 @@ class BlocRepository extends Repository /** * 是否开启数据转化 - * + * * @var bool */ protected $needTransform = false; @@ -59,4 +59,4 @@ class BlocRepository extends Repository return $this; } -} \ No newline at end of file +} diff --git a/app/Domains/Real/Commands/Sync/AddedOrderSync.php b/app/Domains/Real/Commands/Sync/AddedOrderSync.php index ef95d3f2..473212b5 100644 --- a/app/Domains/Real/Commands/Sync/AddedOrderSync.php +++ b/app/Domains/Real/Commands/Sync/AddedOrderSync.php @@ -25,8 +25,8 @@ class AddedOrderSync extends Command public function handle() { $this->datetime = $this->getDateTime(); - $this->companies = app(CompanyRepository::class)->get()->keyBy('sn'); - $this->packages = app(PackageRepository::class)->get()->keyBy('sn'); + $this->companies = app(CompanyRepository::class)->withTrashed()->get()->keyBy('sn'); + $this->packages = app(PackageRepository::class)->withTrashed()->get()->keyBy('sn'); $orders = $this->getOrders(); $orderItems = $this->getOrderItems($orders); diff --git a/app/Domains/Real/Commands/Sync/OrderBaseSync.php b/app/Domains/Real/Commands/Sync/OrderBaseSync.php index 89e10fac..bb92502d 100644 --- a/app/Domains/Real/Commands/Sync/OrderBaseSync.php +++ b/app/Domains/Real/Commands/Sync/OrderBaseSync.php @@ -29,8 +29,8 @@ class OrderBaseSync extends Command public function handle() { - $this->companies = app(CompanyRepository::class)->get()->keyBy('sn'); - $this->packages = app(PackageRepository::class)->get()->keyBy('sn'); + $this->companies = app(CompanyRepository::class)->withTrashed()->get()->keyBy('sn'); + $this->packages = app(PackageRepository::class)->withTrashed()->get()->keyBy('sn'); $orders = $this->getOrders(); $cards = $this->getCards($orders); diff --git a/app/Domains/Real/Commands/Sync/PackageSync.php b/app/Domains/Real/Commands/Sync/PackageSync.php index b8f968c8..d33aec29 100644 --- a/app/Domains/Real/Commands/Sync/PackageSync.php +++ b/app/Domains/Real/Commands/Sync/PackageSync.php @@ -28,7 +28,7 @@ class PackageSync extends Command public function handle() { $datetime = $this->getDateTime(); - $this->companies = app(CompanyRepository::class)->get()->pluck('sn')->toArray(); + $this->companies = app(CompanyRepository::class)->withTrashed()->get()->pluck('sn')->toArray(); $basePackages = $this->getBasePackages(); diff --git a/app/Domains/Virtual/Commands/Sync/Command.php b/app/Domains/Virtual/Commands/Sync/Command.php index a03d242b..d4a456b0 100644 --- a/app/Domains/Virtual/Commands/Sync/Command.php +++ b/app/Domains/Virtual/Commands/Sync/Command.php @@ -40,7 +40,7 @@ class Command extends BaseCommand return Carbon::parse($month)->startOfMonth(); } - + return Carbon::now()->startOfMonth()->subMonth(); } diff --git a/app/Domains/Virtual/Commands/Sync/ProductSync.php b/app/Domains/Virtual/Commands/Sync/ProductSync.php index d7043fde..d9e1d27c 100644 --- a/app/Domains/Virtual/Commands/Sync/ProductSync.php +++ b/app/Domains/Virtual/Commands/Sync/ProductSync.php @@ -17,7 +17,7 @@ class ProductSync extends Command public function handle() { - $packages = app(PackageRepository::class)->where('type', 0)->get()->keyBy('sn')->toArray(); + $packages = app(PackageRepository::class)->withTrashed()->where('type', 0)->get()->keyBy('sn')->toArray(); $fields = ['company', 'content', 'order_account'];