hrjy 2 年之前
父节点
当前提交
2638a13482
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 1 1
      app/admin/model/auction/AuctionOrder.php
  2. 5 5
      app/api/controller/auction/AuctionProductController.php

+ 1 - 1
app/admin/model/auction/AuctionOrder.php

@@ -72,7 +72,7 @@ class AuctionOrder extends BaseModel
         if (isset($where['excel']) && $where['excel'] == 1) {
         if (isset($where['excel']) && $where['excel'] == 1) {
             self::SaveExcel($list);
             self::SaveExcel($list);
         }
         }
-        $data['count'] = $model->count();
+        $data['count'] = self::count();
         if ($where['page'] && $where['limit']){
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
             $model->page($where['page'], $where['limit']);
         }else{
         }else{

+ 5 - 5
app/api/controller/auction/AuctionProductController.php

@@ -115,14 +115,14 @@ class AuctionProductController
             if ($order){
             if ($order){
                 return app('json')->fail('商品已卖出');
                 return app('json')->fail('商品已卖出');
             }
             }
+            $redis = new \Redis();
+            $redis->connect('127.0.0.1','6379'); // redis 缓存
+            if (!$redis->lPop($data['product_id'])){
+                return app('json')->fail('商品已卖出');
+            }
             $order_id = getNewOrderId();
             $order_id = getNewOrderId();
             if ($count >= 1){
             if ($count >= 1){
                 if ($user['anticipate'] < 200) return app('json')->fail('艺金券不足');
                 if ($user['anticipate'] < 200) return app('json')->fail('艺金券不足');
-                $redis = new \Redis();
-                $redis->connect('127.0.0.1','6379'); // redis 缓存
-                if (!$redis->lPop($data['product_id'])){
-                    return app('json')->fail('商品已卖出');
-                }
                 $user['anticipate'] -= 200;
                 $user['anticipate'] -= 200;
                 User::where('uid', $user['uid'])->update(['anticipate' => $user['anticipate']]);
                 User::where('uid', $user['uid'])->update(['anticipate' => $user['anticipate']]);
                 UserBill::expend('冻结艺金券',$user['uid'], 'anticipate', 'fz_anticipate', 200, $user['spread_uid'], $user['anticipate'], '购买订单'.$order_id.'冻结艺金券');
                 UserBill::expend('冻结艺金券',$user['uid'], 'anticipate', 'fz_anticipate', 200, $user['spread_uid'], $user['anticipate'], '购买订单'.$order_id.'冻结艺金券');