挂售

app/admin/model/auction/AuctionOrder.php

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

app/admin/model/user/User.php

@@ -169,7 +169,7 @@ class User extends BaseModel
      */
     public static function getUserList($where)
     {
-        $model = self::setWherePage(self::setWhere($where), $where, ['w.sex', 'w.province', 'w.city', 'u.status', 'u.is_promoter'], ['u.nickname', 'u.uid', 'u.phone']);
+        $model = self::setWherePage(self::setWhere($where), $where, ['w.sex', 'w.province', 'w.city', 'u.status', 'u.is_promoter'], ['u.nickname', 'u.uid', 'u.phone','u.account']);
         $list = $model->alias('u')
             ->join('WechatUser w', 'u.uid=w.uid')
             ->field('u.*,w.country,w.province,w.city,w.sex,w.unionid,w.openid,w.routine_openid,w.groupid,w.tagid_list,w.subscribe,w.subscribe_time')

app/admin/view/auction/auction_order/index.php

@@ -249,7 +249,7 @@
             {field: 'account', title: '用户账号', templet: '#account',  align: 'center'},
             {field: 'nickname', title: '用户呢称', templet: '#nickname',  align: 'center'},
             {field: 'us_account', title: '卖家账号', templet: '#us_account',  align: 'us_account'},
-            {field: 'us_account', title: '卖家昵称', templet: '#us_account',  align: 'us_account'},
+            {field: 'us_nickname', title: '卖家昵称', templet: '#us_nickname',  align: 'us_account'},
             {field: 'name', title: '商品', templet: '#name',  align: 'center'},
             {field: 'price', title: '购买价格', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
             {field: 'upload_image', title: '打款凭证', templet: '#upload_image',  align: 'center',width: '5%'},

app/api/controller/auction/AuctionController.php

@@ -9,6 +9,8 @@ use app\models\auction\AuctionBooking;
 use app\models\auction\AuctionGu;
 use app\models\auction\AuctionOrder;
 use app\models\auction\AuctionPay;
+use app\models\auction\AuctionProduct;
+use app\models\auction\AuctionTime;
 use app\models\user\User;
 use app\models\user\UserBill;
 use app\Request;
@@ -119,7 +121,41 @@ class AuctionController
         if (strtotime($auction['rend_time']) < time()){
             return app('json')->fail('进场时间已过');
         }
-
+        $model = AuctionProduct::where('is_show', 1)->where('auction_id', $data['id'])->order('id DESC');
+        $list = $model->select();
+        $list = empty($list)? [] : $list->toArray();
+        $lists = [];
+        if ($list){
+            foreach ($list as $k => $v) {
+                $order = AuctionOrder::where('product_id', $v['id'])->where('status', '>', 0)->where('frequency', $auction['frequency'])->find();
+                if ($order){
+                    $list[$k]['status'] = 2;// 已被购买
+                    $list[$k]['str'] = '已卖完';
+                }else{
+                    $list[$k]['status'] = 1;// 能购买
+                    $list[$k]['str'] = '购买';
+                }
+                if ($v['is_admin'] == 2){
+                    $time = AuctionTime::where([['auction_id', '=', $auction['id']], ['product_id', '=', $v['id']], ['add_time', '=', strtotime(date('Y-m-d', time()))]])->find();
+                    if (!$time){
+                        unset($list[$k]);
+                    } else{
+                        $lists[] = $list[$k];
+                    }
+                }else{
+                    $lists[] = $list[$k];
+                }
+            }
+        }
+        $redis = new \Redis();
+        $redis->connect('127.0.0.1','6379', 3600);
+        foreach ($lists as $k => $v) {
+            if ($v['status'] == 1) {
+                if (!$redis->llen($v['id']) > 0) {
+                    $redis->lPush($v['id'], json_encode($v));
+                }
+            }
+        }
         return app('json')->successful('可进入');
 
     }

app/api/controller/auction/AuctionProductController.php

@@ -110,16 +110,11 @@ class AuctionProductController
         if ($product['uid'] == $request->uid()) return app('json')->fail('无法购买自己商品');
         if ($product){
             AuctionOrder::beginTrans();
-            // 查询商品是否以卖出
+            //查询商品是否以卖出
             $order = AuctionOrder::where('product_id', $data['product_id'])->where('status', '>', 0)->where('frequency', $auction['frequency'])->find();
             if ($order){
                 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();
             if ($count >= 1){
                 if ($user['anticipate'] < 200) return app('json')->fail('艺金券不足');
@@ -133,7 +128,11 @@ class AuctionProductController
                     'anticipate' => 200
                 ]);
             }
-
+            $redis = new \Redis();
+            $redis->connect('127.0.0.1','6379'); // redis 缓存
+            if (!$redis->lPop($data['product_id'])){
+                return app('json')->fail('商品已卖出');
+            }
             $res = AuctionOrder::create([
                 'uid' => $request->uid(),
                 'collection_id' => $product['uid'],// 商品拥有有人

app/models/auction/AuctionProduct.php

@@ -80,13 +80,8 @@ class AuctionProduct extends BaseModel
 
         $a = [];
         $b = [];
-        $redis = new \Redis();
-        $redis->connect('127.0.0.1','6379', 3600);
         foreach ($lists as $k => $v){
             if ($v['status']  == 1){
-                if (!$redis->llen($v['id']) > 0){
-                    $redis->lPush($v['id'], json_encode($v));
-                }
                 $a[] = $v; // 未卖出的商品
             }
             if ($v['status']  == 2) $b[] = $v; // 卖出的商品