diff --git a/app/Core/AbstractExport.php b/app/Core/AbstractExport.php index 4215a47c..449ffb09 100644 --- a/app/Core/AbstractExport.php +++ b/app/Core/AbstractExport.php @@ -5,7 +5,6 @@ namespace App\Core; use App\Models\Export\Export; use Illuminate\Support\Carbon; use Dipper\Excel\Events\AfterStore; -use Dipper\Excel\Concerns\WithTitle; use Dipper\Excel\Events\AfterExport; use Dipper\Excel\Concerns\Exportable; use Dipper\Excel\Concerns\WithEvents; @@ -16,7 +15,7 @@ use Illuminate\Support\Facades\Storage; use Dipper\Excel\Concerns\ShouldAutoSize; use App\Domains\Export\Repositories\ExportRepository; -abstract class AbstractExport implements WithEvents, WithTitle, ShouldAutoSize +abstract class AbstractExport implements WithEvents, ShouldAutoSize { use Exportable; diff --git a/app/Domains/Virtual/Services/OrderService.php b/app/Domains/Virtual/Services/OrderService.php index 82316486..8c466c27 100644 --- a/app/Domains/Virtual/Services/OrderService.php +++ b/app/Domains/Virtual/Services/OrderService.php @@ -394,15 +394,14 @@ class OrderService extends Service if (isset($attributes['selected']) && is_array($attributes['selected']) && count($attributes['selected'])) { if ($attributes['type'] === 0) { - $exists = $this->orderCardPartitionRepository->withConditions([ + $exists = $this->orderCardPartitionRepository->select('sim')->withConditions([ 'type' => 0, 'sim' => array_pluck($attributes['selected'], 'sim') - ])->count(); + ])->get()->pluck('sim')->toArray(); - if ($exists) { + if (!empty($exists)) { DB::rollBack(); - $simArray = implode(',', array_pluck($attributes['selected'], 'sim')); - throw new NotAllowedException("存在已被其他订单使用的卡: ($simArray)"); + throw new NotAllowedException("存在已被其他订单使用的卡 #:" . implode(',', $exists)); } } @@ -1008,8 +1007,9 @@ class OrderService extends Service $data = array_values($data); foreach (array_chunk($data, 1000) as $value) { - if ($table === 'virtual_order_cards' && DB::table($table)->whereIn('sim', array_pluck($value, 'sim'))->whereNull('deleted_at')->count()) { - throw new ExistedException('出现重复销售卡'); + if ($table === 'virtual_order_cards') { + $exists = DB::table($table)->whereIn('sim', array_pluck($value, 'sim'))->whereNull('deleted_at')->get()->pluck('sim')->toArray(); + throw new ExistedException('出现重复销售卡 #:', implode(',', $exists)); } DB::table($table)->upsert($value, ['sim', 'order_id', 'refunded_at', 'deleted_at']);