修改

app/admin/controller/user/User.php

@@ -456,10 +456,10 @@ class User extends AuthController
         $edit['mark'] = $data['mark'];
         $edit['is_agent'] = $data['is_agent'];
         if($data['is_promoter']==1){
-            if($user['level']<3){
-                return $this->failed('等级未达到店长！不可为推广员');
-                die;
-            }
+//            if($user['level']<3){
+//                return $this->failed('等级未达到店长！不可为推广员');
+//                die;
+//            }
             $edit['is_promoter'] = $data['is_promoter'];
         }else{
             $edit['is_promoter'] = $data['is_promoter'];

app/api/controller/auction/AuctionController.php

@@ -17,7 +17,7 @@ use think\facade\Cache;
 use crmeb\services\{
     CacheService,
     ExpressService,
-    SystemConfigService,
+    SystemConfigService
 };
 use crmeb\services\UtilService;
 use crmeb\repositories\OrderRepository;
@@ -112,9 +112,12 @@ class AuctionController
         $time = strtotime(date('Y-m-d', time()));// 今天
         $today = strtotime(date('Y-m-d', strtotime('+1day')));// 明天
 
+        if (!$booking){
+            return app('json')->fail('未预约');
+        }
         if ($user['is_new'] == 1 or ($user['green_time'] >= $time and $user['green_time'] <= $today)){
             // 新人或者绿色通道提前三分钟入场
-            if (strtotime($auction['radd_time']) -3000 > time()){
+            if (strtotime($auction['radd_time']) -180 > time()){
                 return app('json')->fail('未到进入时间');
             }
             if (strtotime($auction['rend_time']) < time()){
@@ -129,12 +132,8 @@ class AuctionController
                 return app('json')->fail('进场时间已过');
             }
         }
+        return app('json')->successful('可进入');
 
-        if ($booking){
-            return app('json')->successful('可进入');
-        }else{
-            return app('json')->fail('未预约');
-        }
     }
 
 

app/api/controller/auction/AuctionProductController.php

@@ -17,7 +17,7 @@ use think\facade\Cache;
 use crmeb\services\{
     CacheService,
     ExpressService,
-    SystemConfigService,
+    SystemConfigService
 };
 use crmeb\services\UtilService;
 use crmeb\repositories\OrderRepository;

app/api/controller/user/UserController.php

@@ -62,7 +62,7 @@ class UserController
         $level = UserLevel::where('id', $info['level'])->find();
         $info['level_name'] = $level['name']? $level['name'] : '草民';
         if ($sell){
-            $info['profit'] = bcsub($sell, $buy, 2); // 收益
+            $info['profit'] = bcsub($sell, $buy, 2)  <= 0? 0 :  bcsub($sell, $buy, 2); // 收益
         }else{
             $info['profit'] = 0; // 收益
         }

app/models/auction/AuctionOrder.php

@@ -257,7 +257,7 @@ class AuctionOrder extends BaseModel
                 $booking = AuctionBooking::where([['uid', '=', $v['uid']], ['status', '=', 1], ['auction_id', '=', $auction['id']]])->where('status', '=', 1)->find(); // 找到预约订单
                 if ($booking){
                     $user = \app\models\user\User::where('uid', $v['collection_id'])->find();
-                    $user['anticipate'] = $user['anticipate'] + $auction['anticipate']; // 增加预约卷
+                    $user['anticipate'] = $user['anticipate'] + $auction['anticipate']; // 卖家增加预约卷
                     UserBill::income('增加预约卷', $v['collection_id'], 'anticipate', 'add_anticipate',  $auction['anticipate'], $v['uid'], $user['anticipate'], '卖出订单未上传支付凭证,增加'.$auction['anticipate'].'预约卷');
 
                     $user->save();
@@ -278,23 +278,26 @@ class AuctionOrder extends BaseModel
      */
     public static function th()
     {
-        $auction = Auction::where('rend_time', '<', time())->select();
+        $auction = Auction::where('rend_time', '<', date('H:i:s', time()))->select();
         if ($auction){
             foreach ($auction as $k => $v){
 
                 $booking = AuctionBooking::where([['auction_id', '=', $v['id']], ['status','=' , 1]])->select();
-
                 if ($booking){
                     foreach ($booking as $key => $value){
-                        $find = AuctionBooking::find($value['id']);
-                        $find['status'] = 0;
-
-                        $user = User::where('uid', $value['uid'])->find();
-                        $user['anticipate'] = $user['anticipate'] + $value['anticipate'];
-
-                        $user->save();
-                        $find->save();
-                        UserBill::income('预约卷增加',$user['uid'], 'anticipate', 'add_anticipate', $value['anticipate'], 0, $user['anticipate'], '预约卷退回');
+                        $product = AuctionProduct::where('auction_id', $value['auction_id'])->column('id');
+                        $order = AuctionOrder::where([['product_id', 'in', $product], ['frequency', '=', $value['frequency']], ['uid', '=', $value['uid']]])->where('status','>', 0)->find();
+                        if (!$order){
+                            $find = AuctionBooking::find($value['id']);
+                            $find['status'] = 0;
+
+                            $user = User::where('uid', $value['uid'])->find();
+                            $user['anticipate'] = $user['anticipate'] + $value['anticipate'];
+
+                            $user->save();
+                            $find->save();
+                            UserBill::income('预约卷增加',$user['uid'], 'anticipate', 'add_anticipate', $value['anticipate'], 0, $user['anticipate'], '预约卷退回');
+                        }
                     }
                 }
             }

app/models/auction/AuctionProduct.php

@@ -43,7 +43,8 @@ class AuctionProduct extends BaseModel
         $list = empty($list)? [] : $list->toArray();
         if ($list){
             foreach ($list as $k => $v) {
-                $order = AuctionOrder::where('product_id', $v['id'])->where('status', '>', 0)->whereBetweenTime('create_time', date('Y-m-d H:i:s', strtotime(date('Y-m-d'))), date('Y-m-d H:i:s', strtotime('+1 day')))->find();
+                $auction = Auction::where('id', $v['auction_id'])->find();
+                $order = AuctionOrder::where('product_id', $v['id'])->where('status', '>', 0)->where('frequency', $auction['frequency'])->find();
                 if ($order){
                     $list[$k]['status'] = 2;// 已被购买
                     $list[$k]['str'] = '已卖完';
@@ -69,7 +70,20 @@ class AuctionProduct extends BaseModel
         $model = self::where('is_show', 1)->where('uid', $uid)->order('sort DESC,id DESC');
         $model->page($data['page'], $data['limit']);
 
-        $list = $model->select()->toArray();
+        $list = $model->select();
+        $list = empty($list)? [] : $list->toArray();
+        foreach ($list as $k => $v)
+        {
+            $auction = Auction::where('id', $v['auction_id'])->find();
+            if (strtotime(date('Y-m-d',strtotime($v['update_time']))) < strtotime(date('Y-m-d'))){
+                $list[$k]['g_time'] = date('Y-m-d H:i:s', strtotime($auction['radd_time']));
+            }else{
+                $list[$k]['g_time'] = date('Y-m-d', strtotime('+1 day')).' '.$auction['radd_time'];
+            }
+
+
+        }
+
         return $list;
     }
 

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.d618d095.js></script><script src=/index/static/js/index.ec2e761d.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.d618d095.js></script><script src=/index/static/js/index.9069f88a.js></script></body></html>