From ffcdd297db31720ef8e06838c887ec00b742bd1e Mon Sep 17 00:00:00 2001 From: denghy Date: Mon, 8 Apr 2019 13:59:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Domains/Virtual/Services/OrderService.php | 5 +++++ frontend/src/views/virtual/orders/index.vue | 12 ++++++++++-- frontend/src/views/virtual/orders/js/index.js | 10 ++++++++++ public/js/app.e80d0ca6.js | 2 ++ public/js/app.e80d0ca6.js.map | 1 + public/js/chunk-01a502ce.41cb7095.js | 15 +++++++++++++++ public/js/chunk-01a502ce.41cb7095.js.map | 1 + resources/views/index.blade.php | 2 +- 8 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 public/js/app.e80d0ca6.js create mode 100644 public/js/app.e80d0ca6.js.map create mode 100644 public/js/chunk-01a502ce.41cb7095.js create mode 100644 public/js/chunk-01a502ce.41cb7095.js.map diff --git a/app/Domains/Virtual/Services/OrderService.php b/app/Domains/Virtual/Services/OrderService.php index 9dd975ca..ae5cf11b 100644 --- a/app/Domains/Virtual/Services/OrderService.php +++ b/app/Domains/Virtual/Services/OrderService.php @@ -21,6 +21,7 @@ use App\Models\Real\OrderCardPartition as RealOrderCardPartition; use App\Domains\Virtual\Repositories\OrderCardPartitionRepository; use App\Domains\Real\Repositories\OrderRepository as RealOrderRepository; use App\Domains\Real\Repositories\OrderCardPartitionRepository as RealOrderCardPartitionRepository; +use App\Exceptions\ExistedException; class OrderService extends Service { @@ -752,6 +753,10 @@ class OrderService extends Service } foreach (array_chunk($data, 1000) as $value) { + if ($table === 'virtual_order_cards' && DB::table($table)->where('sim', array_pluck($value, 'sim'))->whereNotNull('deleted_at')->count()) { + throw new ExistedException('出现重复销售卡'); + } + DB::table($table)->upsert($value, ['sim', 'order_id', 'deleted_at']); $simArray = implode(',', array_pluck($value, 'sim')); DB::statement("select fix_timelines('{{$simArray}}'::INT8[]);"); diff --git a/frontend/src/views/virtual/orders/index.vue b/frontend/src/views/virtual/orders/index.vue index ab2445e1..1f6f35d7 100644 --- a/frontend/src/views/virtual/orders/index.vue +++ b/frontend/src/views/virtual/orders/index.vue @@ -10,7 +10,15 @@
  • -
    +
    + 数据锁定 + + 开 + 关 + +
    + +
    -
    +