diff --git a/app/Domains/Company/Http/Controllers/OrderController.php b/app/Domains/Company/Http/Controllers/OrderController.php index 0443449f..a959fa0f 100644 --- a/app/Domains/Company/Http/Controllers/OrderController.php +++ b/app/Domains/Company/Http/Controllers/OrderController.php @@ -46,7 +46,7 @@ class OrderController extends Controller return [ 'id' => $item->id, 'sn' => $item->sn, - 'package_name' => $item->package->name, + 'package_name' => $item->package['name'], 'pay_channel' => CommonService::namePayChannel($item->pay_channel), 'carrier_operator' => $carrierOperators[$item->package->carrier_operator], 'unit_price' => $item->unit_price, diff --git a/app/Domains/Virtual/Http/Controllers/OrderController.php b/app/Domains/Virtual/Http/Controllers/OrderController.php index 2709b0a2..cb7a3b70 100644 --- a/app/Domains/Virtual/Http/Controllers/OrderController.php +++ b/app/Domains/Virtual/Http/Controllers/OrderController.php @@ -58,13 +58,13 @@ class OrderController extends Controller 'sn' => $item->sn, 'transaction_no' => $item->transaction_no, 'package_id' => $item->package_id, - 'package_name' => $item->package->name, + 'package_name' => $item->package['name'], 'company_id' => $item->company_id, - 'company_name' => $item->company->name, + 'company_name' => $item->company['name'], 'pay_channel' => $item->pay_channel, 'pay_channel_name' => CommonService::namePayChannel($item->pay_channel), - 'carrier_operator' => $item->package->carrier_operator, - 'carrier_operator_name' => $carrierOperators[$item->package->carrier_operator], + 'carrier_operator' => $item->package['carrier_operator'], + 'carrier_operator_name' => $carrierOperators[$item->package['carrier_operator']], 'unit_price' => $item->unit_price, 'counts' => $item->counts, 'total_price' => $item->total_price, diff --git a/app/Domains/Virtual/Services/OrderService.php b/app/Domains/Virtual/Services/OrderService.php index 455f11ce..fd38115b 100644 --- a/app/Domains/Virtual/Services/OrderService.php +++ b/app/Domains/Virtual/Services/OrderService.php @@ -140,6 +140,8 @@ class OrderService extends Service if (isset($attributes['unit_price'])) { $attributes['unit_price'] = intval($attributes['unit_price'] * 100); + $attributes['total_price'] = $attributes['unit_price'] * $attributes['counts']; + $attributes['custom_price'] = $attributes['unit_price'] * $attributes['counts']; } if (!$attributes['id']) { @@ -223,6 +225,12 @@ class OrderService extends Service } $this->orderRepository->setModel($node)->update($attributes); + + if (isset($attributes['unit_price'])) { + $this->orderCardPartitionRepository->where('type', $node->type)->where('order_id', $node->id)->update([ + 'unit_price' => $attributes['unit_price'], + ]); + } } else { $maxId = Order::withTrashed()->max('id'); $attributes['id'] = ++$maxId; @@ -231,7 +239,7 @@ class OrderService extends Service throw new NotAllowedException('非法操作'); } - $attributes['price'] = $product->price; + $attributes['unit_price'] = $product->price; $attributes['total_price'] = $attributes['unit_price'] * $attributes['counts']; $attributes['custom_price'] = $attributes['unit_price'] * $attributes['counts']; $attributes['order_at'] = $attributes['order_at'] ?? date('Y-m-d H:i:s'); diff --git a/frontend/src/views/virtual/orders/edit.vue b/frontend/src/views/virtual/orders/edit.vue index 53052b50..06b84d43 100644 --- a/frontend/src/views/virtual/orders/edit.vue +++ b/frontend/src/views/virtual/orders/edit.vue @@ -85,8 +85,8 @@ - - + + @@ -113,10 +113,11 @@