diff --git a/app/Admin/Extensions/Grid/AuditIndustryProduct.php b/app/Admin/Extensions/Grid/AuditIndustryProduct.php index 0bba531..4bf1a92 100644 --- a/app/Admin/Extensions/Grid/AuditIndustryProduct.php +++ b/app/Admin/Extensions/Grid/AuditIndustryProduct.php @@ -5,6 +5,7 @@ use App\Common\ProductStatus; use App\Models\IndustryProduct; use Dcat\Admin\Grid\RowAction; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; /** * 行业产品审核 @@ -33,13 +34,19 @@ class AuditIndustryProduct extends RowAction public function handle(Request $request) { + DB::beginTransaction(); try { - $user = IndustryProduct::find($this->getKey()); - $user->status = $request->action == 1 ? ProductStatus::ON_SALE : ProductStatus::REFUSE; - $user->save(); + //修改产品状态 + $industry = IndustryProduct::find($this->getKey()); + $industry->status = $request->action == 1 ? ProductStatus::ON_SALE : ProductStatus::REFUSE; + $industry->save(); + //如果是拒绝,返还冻结金额 + + DB::commit(); return $this->response()->success("审核成功")->refresh(); } catch (\Exception $e) { + DB::rollBack(); return $this->response()->error($e->getMessage()); } } diff --git a/app/Http/Controllers/Api/VerificationController.php b/app/Http/Controllers/Api/VerificationController.php index 3f956b5..c9e3e3d 100644 --- a/app/Http/Controllers/Api/VerificationController.php +++ b/app/Http/Controllers/Api/VerificationController.php @@ -40,14 +40,14 @@ class VerificationController extends Controller ->whereIn('status', [OrderStatus::PAID, OrderStatus::PAID_RETAINAGE, OrderStatus::OFFLINE_PAID, OrderStatus::REFUSED_REFUND]) ->find($id); if (!$order) { - return $this->error('订单不存在或订单状态不允许核销1' . $input_verify_code); + return $this->error('订单不存在或订单状态不允许核销1——' . $input_verify_code); } $mobile = User::where('id', $this->user_id)->value('mobile'); $checkMobile = Product::query()->whereIn('id', explode(',', $order->product_ids))->where('verify_mobile', $mobile)->doesntExist(); if ($checkMobile) { - return $this->error('对不起,你没有核销权限,请联系管理员1' . $input_verify_code); + return $this->error('对不起,你没有核销权限,请联系管理员1——' . $input_verify_code); } $order->status = OrderStatus::SUCCESS; @@ -77,14 +77,14 @@ class VerificationController extends Controller $order = IndustryOrder::with('industryProduct:id,verify_mobile') ->where(['status' => OrderStatus::OFFLINE_PAID, 'verify_code' => $verify_code])->find($id); if (!$order) { - return $this->error('订单不存在或订单状态不允许核销2' . $input_verify_code); + return $this->error('订单不存在或订单状态不允许核销2——' . $input_verify_code); } $user = User::find($this->user_id); if (!$user->mobile) { return $this->error('手机号与核销手机号不符'); } else if ($user->mobile != $order->industryProduct->verify_mobile) { - return $this->error('对不起,你没有该订单的核销权限2' . $input_verify_code); + return $this->error('对不起,你没有该订单的核销权限2——' . $input_verify_code); } DB::beginTransaction();