From 26165fb7f15620a3ea14172835848086291e9218 Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Wed, 22 Apr 2026 18:38:57 +0800 Subject: [PATCH] app login --- app/Admin/Forms/OrderPackage.php | 4 +++- .../Api/Http/Controllers/Auth/MiniprogramController.php | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Admin/Forms/OrderPackage.php b/app/Admin/Forms/OrderPackage.php index 4448a678..7ecf1a21 100644 --- a/app/Admin/Forms/OrderPackage.php +++ b/app/Admin/Forms/OrderPackage.php @@ -61,9 +61,10 @@ class OrderPackage extends Form implements LazyRenderable if ($product->pivot->amount - $amount < 0) { throw new BizException('店铺的 ' . $product->name .' 库存不足'); } + $balance = $product->pivot->amount - $amount; $store->productSkus()->updateExistingPivot($product->id, [ - 'amount' => $product->pivot->amount - $amount + 'amount' => $balance ]); $store->stockLogs()->create([ 'operator_type' => $operator->getMorphClass(), @@ -72,6 +73,7 @@ class OrderPackage extends Form implements LazyRenderable 'source_type' => Order::class, 'source_id' => $order->id, 'amount' => 0-$amount, + 'balance' => $balance, 'product_sku_id' => $product->id, 'remarks' => '后台发货', 'tag_id' => $tag_id, diff --git a/app/Endpoint/Api/Http/Controllers/Auth/MiniprogramController.php b/app/Endpoint/Api/Http/Controllers/Auth/MiniprogramController.php index b8b225f0..55bf40eb 100644 --- a/app/Endpoint/Api/Http/Controllers/Auth/MiniprogramController.php +++ b/app/Endpoint/Api/Http/Controllers/Auth/MiniprogramController.php @@ -35,8 +35,6 @@ class MiniprogramController extends Controller if (!$openid) { throw new BizException('授权失败, 未找到 openid'); } - $time = now(); - $ip = $request->realIp(); try { DB::beginTransaction(); @@ -127,9 +125,9 @@ class MiniprogramController extends Controller * * @throws \App\Exceptions\BizException */ - protected function findUserByCode(string $code): ?User + protected function findUserByCode($code): ?User { - if ($code === '') { + if (!$code) { return null; }