修改

app/admin/controller/auction/AuctionOrder.php

@@ -230,7 +230,7 @@ class AuctionOrder extends AuthController
             \app\admin\model\auction\AuctionProduct::beginTrans();
 
             $product = \app\admin\model\auction\AuctionProduct::find($data['product_id']);
-            if (!$product) Json::fail('数据不存在');
+            if (!$product)return Json::fail('数据不存在');
             $uid = $product['uid']; // 所属人id
 
             $product['uid'] = $data['uid'];// 商品拥有人更新

app/admin/model/auction/AuctionOrder.php

@@ -125,6 +125,7 @@ class AuctionOrder extends BaseModel
             if ($user['spread_uid']) {
                 $spread = $userModel->where('uid', $user['spread_uid'])->find();
                 $spread['green_time'] = strtotime(date('Y-m-d', strtotime('+1 day'))); // 开启明天的绿色通道
+                $spread->save();
             }
             $orderCount =AuctionOrder::where([['uid', '=',  $user['uid']], ['status', '=', 3]])->count();
             if ($orderCount >= 5){
@@ -135,11 +136,10 @@ class AuctionOrder extends BaseModel
         }
         $product = $productModel->where('id', $data['product_id'])->find();
         $auction = $auctionModel->where('id', $product['auction_id'])->find();
-        $booking = $bookingModel->where('auction_id', $auction['id'])->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();
+        $booking = $bookingModel->where('auction_id', $auction['id'])->where('uid', $user['uid'])->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();
         if ($booking['status'] > 0){
             $booking['status'] = 0;
             $booking->save();
-            $spread->save();
             $user['anticipate'] = $user['anticipate'] + $auction['anticipate'];// 退还预约卷
             $user->save();
 

app/api/controller/auction/AuctionProductController.php

@@ -85,8 +85,8 @@ class AuctionProductController
         $auction  = Auction::where('id', $product['auction_id'])->find();
         $count = AuctionOrder::where('frequency',$auction['frequency'])->where('product_id', 'in', $product_ids)->count();
 
-//        $config = SystemConfig::where('menu_name', 'auction_number')->find();
-//        if ($count >=  (int)$config['value']) return app('json')->fail('单场购买数量已到达最大');
+        $config = SystemConfig::where('menu_name', 'auction_number')->find();
+        if ($count >=  (int) preg_replace('~(,(?=[^"]*"(?:[^"]*"[^"]*")*[^"]*$)|")~', '', $config['value'])) return app('json')->fail('单场购买数量已到达最大'); // 查看当前是否已到最大
 
         if ($product['uid'] == $request->uid()) return app('json')->fail('无法购买自己商品');
         if ($product){
@@ -155,7 +155,7 @@ class AuctionProductController
             ['image'],
             ['id']
         ]);
-        if (!$data['image'] || !$data['id'])  return app('json')->fail('数据传入错误');
+        if (!$data['image'] || !$data['id'])  return app('json')->fail('请上传打款凭证');
 
         $order = AuctionOrder::where('id', $data['id'])->find();
         if (!$order) return app('json')->fail('订单不存在');
@@ -248,7 +248,7 @@ class AuctionProductController
 
         if (empty($details)) return app('json')->fail('商品不存在');
         $details['slider_image'] = is_string($details['slider_image']) ? json_decode($details['slider_image'], true) : [];
-        $details['description'] = !empty($details['description']) ? html_entity_decode($details['description'], ENT_COMPAT) : [];
+        $details['description'] = !empty($details['description']) ? html_entity_decode($details['description'], ENT_COMPAT) : '';
         $details['user_nickname'] = User::where('uid', $details['auction_id'])->find()['nickname'];
 
         $auction = Auction::where('id', $details['auction_id'])->find();
@@ -272,6 +272,10 @@ class AuctionProductController
             ->leftJoin('user u', 'a.collection_id = u.uid')
             ->where('a.product_id', $data['product_id'])->where('a.status', 3)->select();
 
+        if (empty($order->toArray())) $order = AuctionProduct::alias('a')
+            ->field('u.nickname,u.avatar,a.create_time')
+            ->leftJoin('user u', 'a.uid = u.uid')
+            ->where('a.id', $data['product_id'])->select();
         $order = empty($order)? [] : $order->toArray();
         return app('json')->successful($order);
     }

app/models/auction/AuctionOrder.php

@@ -224,7 +224,7 @@ class AuctionOrder extends BaseModel
         }
         $product = $productModel->where('id', $data['product_id'])->find();
         $auction = $auctionModel->where('id', $product['auction_id'])->find();
-        $booking = $bookingModel->where('auction_id', $auction['id'])->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();
+        $booking = $bookingModel->where('auction_id', $auction['id'])->where('uid', $user['uid'])->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();
         if ($booking['status'] > 0){
             $booking['status'] = 0;
             $booking->save();

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.3a152ee8.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.e1308cfd.js></script></body></html>