Wesmiler

app/Http/Controllers/Api/v1/GoodsController.php

@@ -36,7 +36,8 @@ class GoodsController extends webApp
         if($datas = GoodsService::make()->getOrderGoods($ids, $goods, $this->userId)){
             return message(1010, true, $datas);
         }else{
-            return message(GoodsService::make()->getError(), false);
+            $error = GoodsService::make()->getError();
+            return message($error, false,'',$error==1042? 403 : 0);
         }
 
     }

app/Services/Api/GoodsService.php

@@ -225,18 +225,22 @@ class GoodsService extends BaseService
     public function getOrderGoods($ids, $goods, $userId, $orderNo='')
     {
         // 用户信息
-        if(empty($orderNo)){
-            $userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
-                ->select(['id', 'discount_point', 'status'])
-                ->first();
-            $status = isset($userInfo['status']) ? $userInfo['status'] : 0;
-            $discountPoint = isset($userInfo['discount_point']) ? $userInfo['discount_point'] : 0; // 折扣
-            if (empty($userInfo) || $status != 1) {
-                $this->error = 1045;
-                return false;
-            }
+        $userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
+            ->select(['id', 'discount_point', 'status'])
+            ->first();
+        $status = isset($userInfo['status']) ? $userInfo['status'] : 0;
+        $discountPoint = isset($userInfo['discount_point']) ? $userInfo['discount_point'] : 0; // 折扣
+        if (empty($userInfo) || $status != 1) {
+            $this->error = 1045;
+            return false;
         }
 
+        if (empty($openid)) {
+            $this->error = 1042;
+            return false;
+        }
+
+
         $list = $this->model->whereIn('id', $ids)
             ->where(['status'=>1,'mark'=>1])
             ->select(['id as goods_id','goods_name','category_id','store_id','delivery_fee','sku_type','price','stock','unit','weight','thumb','sku_type'])

app/Services/Api/OrderService.php

@@ -208,27 +208,8 @@ class OrderService extends BaseService
                 return false;
             }
 
-            // 用户信息
-            RedisService::set($cacheLockKey, ['params' => $params, 'user_id' => $userId], rand(3, 5));
-            $userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
-                ->select(['id', 'openid', 'mobile', 'nickname','discount_point', 'realname', 'balance', 'status'])
-                ->first();
-            $status = isset($userInfo['status']) ? $userInfo['status'] : 0;
-            $openid = isset($userInfo['openid']) ? $userInfo['openid'] : '';
-            $discountPoint = isset($userInfo['discount_point']) ? $userInfo['discount_point'] : 0; // 折扣
-            if (empty($userInfo) || $status != 1) {
-                $this->error = 1045;
-                RedisService::clear($cacheLockKey);
-                return false;
-            }
-
-            if (empty($openid)) {
-                $this->error = '用户微信未授权，请重新授权登录';
-                RedisService::clear($cacheLockKey);
-                return false;
-            }
-
             // 商品数据
+            RedisService::set($cacheLockKey, ['params' => $params, 'user_id' => $userId], rand(3, 5));
             $orderNo = get_order_num('JK');
             $result = GoodsService::make()->getOrderGoods($ids, $goods, $userId, $orderNo);
             if (empty($result)) {

resources/lang/zh-cn/api.php

@@ -37,6 +37,7 @@ return [
     '1039' => '请输入新密码',
     '1040' => '账号被使用',
     '1041' => '请填写账号或密码',
+    '1042' => '用户微信未授权，请重新授权登录',
 
     // 账户
     '2001' => '账号错误',