hrjy преди 2 години
родител
ревизия
e5646cd54c

+ 0 - 35
app/api/controller/auction/AuctionController.php

@@ -121,41 +121,6 @@ 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('可进入');
 
     }

+ 49 - 0
app/models/auction/AuctionOrder.php

@@ -414,5 +414,54 @@ class AuctionOrder extends BaseModel
 
     }
 
+    public static function auction_time()
+    {
+        $auction = Auction::where('status', 1)->select();
+        if ($auction){
+            foreach ($auction as $item){
+                $addtime = strtotime($item['radd_time']);
+                $rendtime = strtotime($item['rend_time']);
+                if (($addtime-360) < time() and $addtime > time()){
+                    $model = AuctionProduct::where('is_show', 1)->where('auction_id', $item['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', $item['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', '=', $item['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));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
 
 }

+ 1 - 0
crmeb/subscribes/TaskSubscribe.php

@@ -120,6 +120,7 @@ class TaskSubscribe
      */
     public function onTask_60()
     {
+        AuctionOrder::auction_time();
         Auction::frequency(); // 更新场次
         AuctionProduct::off_the_shelf(); // 下架未出售商品
     }

+ 1 - 1
public/index/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a9cbb497.js></script><script src=/index/static/js/index.86056633.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a9cbb497.js></script><script src=/index/static/js/index.4b0b0b40.js></script></body></html>

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
public/index/static/js/index.4b0b0b40.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
public/index/static/js/pages-hall-hallpay.7948884c.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
public/index/static/js/pages-user-approve.0c430e59.js


Някои файлове не бяха показани, защото твърде много файлове са промени