From ee394e1ac825d493ed61068c9ab53324b7afde1d Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Mon, 30 Jan 2023 10:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Admin/GoodsController.php     |  6 +++
 .../Controllers/Api/OrderBuyController.php    | 41 +++++++++++++------
 .../Api/Socialite/WeChatController.php        |  2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/modules/Mall/Http/Controllers/Admin/GoodsController.php b/modules/Mall/Http/Controllers/Admin/GoodsController.php
index e5e6918..e892e11 100644
--- a/modules/Mall/Http/Controllers/Admin/GoodsController.php
+++ b/modules/Mall/Http/Controllers/Admin/GoodsController.php
@@ -182,6 +182,12 @@ class GoodsController extends AdminController
                         ->default(0)
                         ->setWidth(2)
                         ->required();
+                    $form->radio('unit', '单位')
+                        ->options([
+                            '瓶' => '瓶',
+                            '箱' => '箱',
+                        ])
+                        ->required();
                 });
             })
             ->when(Goods::TYPE_MULTIPLE, function ($form) {
diff --git a/modules/Mall/Http/Controllers/Api/OrderBuyController.php b/modules/Mall/Http/Controllers/Api/OrderBuyController.php
index ae2e24e..837e2f9 100644
--- a/modules/Mall/Http/Controllers/Api/OrderBuyController.php
+++ b/modules/Mall/Http/Controllers/Api/OrderBuyController.php
@@ -77,6 +77,10 @@ class OrderBuyController extends Controller
 
 
         $type = OrderModel::TYPE_NORMAL;
+        info($goods_sku->goods->channel);
+        info($goods_sku->goods->id);
+        info($goods_sku->id);
+
         if ($goods_sku->goods->channel == Goods::CHANNEL_FREE) {
             $type = OrderModel::TYPE_SAMPLE;
         }
@@ -85,14 +89,21 @@ class OrderBuyController extends Controller
             $type = OrderModel::TYPE_SCORE;
         }
 
-        $areaCode = $user->info->areaCode;
-        if (! $areaCode && $type == OrderModel::TYPE_SAMPLE) {
-            return $this->failed('您没有提货码不可参与此活动');
-        }
-        if ($areaCode->status != AreaCode::STATUS_INIT && $type == OrderModel::TYPE_SAMPLE) {
-            return $this->failed('提货码已被使用，不可重复使用');
+        if ($type == OrderModel::TYPE_SAMPLE) {
+            if (! $user->info->areaCode) {
+                return $this->failed('您没有提货码不可参与此活动');
+            }
+            $areaCode = AreaCode::where('code', $user->info->areaCode)->first();
+            if (! $areaCode) {
+                return $this->failed('您绑定的提货码不正确');
+            }
+
+            if ($areaCode->status != AreaCode::STATUS_INIT) {
+                return $this->failed('提货码已被使用，不可重复使用');
+            }
         }
 
+
         $freight = $item->freight();
         $amount  = $item->total();
         $weight  = $item->weight();
@@ -179,12 +190,18 @@ class OrderBuyController extends Controller
             $type = OrderModel::TYPE_SCORE;
         }
 
-        $areaCode = $user->info->areaCode;
-        if (! $areaCode && $type == OrderModel::TYPE_SAMPLE) {
-            return $this->failed('您没有提货码不可参与此活动');
-        }
-        if ($areaCode->status != AreaCode::STATUS_INIT && $type == OrderModel::TYPE_SAMPLE) {
-            return $this->failed('提货码已被使用，不可重复使用');
+        if ($type == OrderModel::TYPE_SAMPLE) {
+            if (! $user->info->areaCode) {
+                return $this->failed('您没有提货码不可参与此活动');
+            }
+            $areaCode = AreaCode::where('code', $user->info->areaCode)->first();
+            if (! $areaCode) {
+                return $this->failed('您绑定的提货码不正确');
+            }
+
+            if ($areaCode->status != AreaCode::STATUS_INIT) {
+                return $this->failed('提货码已被使用，不可重复使用');
+            }
         }
 
         $address = Address::where('user_id', $user->id)->where('id', $address_id)->first();
diff --git a/modules/User/Http/Controllers/Api/Socialite/WeChatController.php b/modules/User/Http/Controllers/Api/Socialite/WeChatController.php
index 36cad46..6657ee0 100644
--- a/modules/User/Http/Controllers/Api/Socialite/WeChatController.php
+++ b/modules/User/Http/Controllers/Api/Socialite/WeChatController.php
@@ -471,7 +471,7 @@ class WeChatController extends Controller
 
         if ($delivery_code) {
             $areaCode = AreaCode::query()->where('code', $delivery_code)->first();
-            if ($areaCode->user_id) {
+            if ($areaCode->user_id && $areaCode->user_id != Api::userId()) {
                 return $this->failed('当前提货码已被别人使用');
             }