Browse Source

Merge remote-tracking branch 'origin/master'

master
李可松 4 years ago
parent
commit
96af73983b
  1. 2
      app/Http/Controllers/Api/OrderController.php
  2. 2
      app/Http/Controllers/Api/VerificationController.php

2
app/Http/Controllers/Api/OrderController.php

@ -315,7 +315,7 @@ class OrderController extends Controller
'agent_cloud_price' => $ap->agentCloudProduct->price ?? 0,
'prepay_price' => $prepayPrice ?? 0,
'prepay_timeout' => $prepayTimeout ?? 0,
'service_persons' => SystemSetting::val('single', 'price'),
'single_price' => SystemSetting::val('single', 'price'),
'info' => $order_info,
]);

2
app/Http/Controllers/Api/VerificationController.php

@ -209,7 +209,7 @@ class VerificationController extends Controller
$supplier = Supplier::query()->where('id', $v->supplier_id)->lockForUpdate()->first();
//处理交易金
if ($order->single_price > 0) {
if ($order->single_price > 0 && $v->sum_persons > 0) {
//计算交易金
$deposit = bcmul($order->single_price,$v->sum_persons,6);
//流水

Loading…
Cancel
Save