挂售

app/admin/controller/auction/AuctionOrder.php

@@ -59,7 +59,8 @@ class AuctionOrder extends AuthController
             ['status', ''],
             ['gu_id', ''],
             ['product_name'],
-            ['excel', 0]
+            ['excel', 0],
+            ['is_gs', '']
         ]);
         $data = model::list($where);
         foreach ($data['data'] as $key => $val){

app/admin/model/auction/AuctionOrder.php

@@ -53,6 +53,11 @@ class AuctionOrder extends BaseModel
         if (trim($where['gu_id']) != '') $model->where('gu.id', $where['gu_id']);
         if (trim($where['product_name']) != '') $model->where('p.name', $where['product_name']);
         if (trim($where['data']) != '') $model = self::getModelTime($where, $model,  'a.create_time');
+        if ($where['is_gs'] == 2){
+            $model->where('a.is_gs', 0);
+        }else if($where['is_gs'] == 1){
+            $model->where('a.is_gs', 1);
+        }
 
         if (isset($where['excel']) && $where['excel'] == 1) {
             $list = ($list = $model->select()) && count($list) ? $list->toArray() : [];
@@ -86,7 +91,22 @@ class AuctionOrder extends BaseModel
     {
         $export = [];
         foreach ($list as $index => $item) {
-            $status = $item['status']== 0 ? '过期' :  $item['status']== 1 ? '待上传':$item['status']== 2 ? '待审核':$item['status']== 3 ? '完成': '未知';
+            if ($item['status']  == 0 ){
+                $status = '过期订单';
+            }elseif ($item['status'] == 1){
+                $status ='待支付';
+            }elseif ($item['status'] == 2){
+                $status ='待审核';
+            }elseif ($item['status'] == 3){
+                $status ='完成';
+            }
+            if ($item['is_gs']  == 0 and $item['status'] == 0){
+                $is_gs = '过期订单';
+            }elseif ($item['is_gs'] == 0){
+                $is_gs ='未挂售';
+            }elseif ($item['is_gs'] == 1){
+                $is_gs ='已挂售';
+            }
             $export[] = [
                 $item['order_id'],
                 $item['name'],
@@ -97,10 +117,11 @@ class AuctionOrder extends BaseModel
                 $item['us_account'],
                 $item['price'],
                 $status,
+                $is_gs,
                 $item['create_time'],
             ];
         }
-        PHPExcelService::setExcelHeader(['订单号', '商品名', '场馆', '场次', '买家账号', '买家昵称', '卖家账号','商品价格', '状态',
+        PHPExcelService::setExcelHeader(['订单号', '商品名', '场馆', '场次', '买家账号', '买家昵称', '卖家账号','商品价格', '状态','挂售状态',
             '订单时间'])
             ->setExcelTile('订单导出' . date('YmdHis', time()), '订单信息' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)

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

@@ -79,7 +79,25 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="top: -4.5px">是否挂售</label>
+                                <div class="layui-input-block">
+                                    <select name="is_gs">
+                                        <option value="">全部</option>
+                                        <option value="2">未挂售</option>
+                                        <option value="1">已挂售</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="layui-inline" style="top: -5px">
+                                <div class="layui-input-inline">
 
+                                    <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search" >
+                                        <i class="layui-icon layui-icon-search"></i>搜索
+                                    </button>
+
+                                </div>
+                            </div>
                             <div class="layui-col-lg12" id="app1">
                                 <div class="layui-col-lg12">
                                     <label class="layui-form-label">创建状态:</label>
@@ -111,15 +129,6 @@
                                     <i class="fa fa-floppy-o" style="margin-right: 3px;"></i>导出
                                 </button>
                             </div>
-                            <div class="layui-inline" style="top: -5px">
-                                <div class="layui-input-inline">
-
-                                    <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search" >
-                                        <i class="layui-icon layui-icon-search"></i>搜索
-                                    </button>
-
-                                </div>
-                            </div>
                         </div>
                     </form>
                 </div>
@@ -155,7 +164,7 @@
                     <script type="text/html" id="status">
                         {{#  if(d.status < 1){ }}
                         <button type="button" name="status" class="layui-btn-disabled layui-btn-xs" id="">
-                            过期
+                            过期订单
                         </button>
                         {{#  } else if(d.status == 1) { }}
                         <button type="button" name="status" class="layui-btn-xs layui-btn-disabled" id="">
@@ -191,6 +200,24 @@
                         </button>
                         {{#  } }}
                     </script>
+                    <script type="text/html" id="is_gs">
+                        {{#  if(d.status  <  1){ }}
+                            <button type="button" name="status" class="layui-btn-disabled layui-btn-xs" id="">
+                                过期订单
+                            </button>
+                        {{#  } else { }}
+                            {{#  if(d.is_gs  <  1){ }}
+                            <button type="button" name="status" class="layui-btn-disabled layui-btn-xs" id="">
+                                未挂售
+                            </button>
+                            {{#  } else { }}
+                            <button type="button" name="status" class="layui-btn layui-btn-xs" id="">
+                                已挂售
+                            </button>
+                            {{#  } }}
+                        {{#  } }}
+
+                    </script>
                     <script type="text/html" id="act">
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='qd' id="">
                             通过
@@ -227,6 +254,7 @@
             {field: 'upload_image', title: '打款凭证', templet: '#upload_image',  align: 'center',width: '5%'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'appeal', title: '申诉状态', templet: '#appeal', align: 'center'},
+            {field: 'is_gs', title: '挂售状态', templet: '#is_gs', align: 'center'},
             {field: 'create_time', title: '预约时间', templet: '#date', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
         ];

app/api/controller/auction/AuctionOrderController.php

@@ -42,7 +42,7 @@ class AuctionOrderController
         $data = UtilService::postMore([
             'order_id'
         ]);
-        $order = AuctionOrder::where([['order_id', '=', $data['order_id']], ['uid', '=', $request->uid()]])->find();
+        $order = AuctionOrder::where([['order_id', '=', $data['order_id']], ['collection_id', '=', $request->uid()]])->find();
         if ($order['appeal'] == 1) return app('json')->fail('该订单已在申诉中');// 失败
         if (!$order) return app('json')->fail('没有订单');// 失败
         $product = AuctionProduct::where('id', $order['product_id'])->find();
@@ -70,7 +70,7 @@ class AuctionOrderController
         $data = UtilService::postMore([
             'order_id'
         ]);
-        $order = AuctionOrder::where([['order_id', '=', $data['order_id']], ['uid', '=', $request->uid()]])->find();
+        $order = AuctionOrder::where([['order_id', '=', $data['order_id']], ['collection_id', '=', $request->uid()]])->find();
         if ($order['appeal'] == 0) return app('json')->fail('该订单未申诉');// 失败
         if (!$order) return app('json')->fail('没有订单');// 失败
         $product = AuctionProduct::where('id', $order['product_id'])->find();

app/api/controller/auction/AuctionProductController.php

@@ -96,7 +96,7 @@ class AuctionProductController
             if ($radd_time - 180 > time()){
                 return app('json')->fail('未到抢购时间');
             }
-        }else if(strtotime($auction['create_time']) < time()){
+        }else if($radd_time > time()){
             return app('json')->fail('当前未到抢购时间');
         }
 

app/models/auction/AuctionOrder.php

@@ -75,7 +75,12 @@ class AuctionOrder extends BaseModel
                 $list = self::where([['uid', '=', $uid], ['status', '=', 3], ['is_gs', '=', 1]])->page($data['page'], $data['limit'])->select(); //完成订单
             }else if($data['type'] == 4) {
 
-                $list = self::where([['uid', '=', $uid], ['status', '=', 3],['is_gs', '=', 0]])->page($data['page'], $data['limit'])->select(); //待挂售订单
+                $list = self::alias('a')
+                    ->field('a.*,p.frozen')
+                    ->where([['a.uid', '=', $uid], ['a.status', '=', 3],['a.is_gs', '=', 0]])
+                    ->leftJoin('auction_product p', 'p.id = a.product_id')
+                    ->page($data['page'], $data['limit'])
+                    ->select(); //待挂售订单
             }else{
                 $list = self::where([['uid', '=', $uid], ['status', '<', 1]])->page($data['page'], $data['limit'])->select(); //过期订单
             }
@@ -171,6 +176,7 @@ class AuctionOrder extends BaseModel
 //        $user['anticipate'] = $user['anticipate']-$price*($product['deduct']/100); // 扣除当前卖出价格百分比的预约卷
 //        $user->save();
 //        UserBill::expend('预约卷扣除', $user['uid'], 'anticipate','reduce_anticipate', $price*($product['deduct']/100), 0, $user['anticipate'] ,'卖出扣除预约卷');
+        AuctionTime::where([['product_id', '=', $product['id']], ['uid', '=', $id]])->delete();
         $productModel->where('id', $product['id'])->save(['is_show' => 0]); //下架等待挂售
 
     }

app/models/auction/AuctionProduct.php

@@ -42,9 +42,9 @@ class AuctionProduct extends BaseModel
         $list = $model->select();
         $list = empty($list)? [] : $list->toArray();
         $lists = [];
+        $auction = Auction::where('id', $data['id'])->find();
         if ($list){
             foreach ($list as $k => $v) {
-                $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;// 已被购买
@@ -64,7 +64,14 @@ class AuctionProduct extends BaseModel
                     $lists[] = $list[$k];
                 }
             }
+            $productId = AuctionProduct::where('auction_id', $data['id'])->column('id');
+            $orderList = AuctionOrder::alias('a')
+                ->field('p.*')
+                ->leftJoin('auction_product p', 'a.product_id = p.id')
+                ->where([['a.product_id', 'in', $productId], ['a.frequency', '=', $auction['frequency']], ['a.status', '=', 3]])
+                ->select();
         };
+
         $a = [];
         $b = [];
         foreach ($lists as $k => $v){
@@ -74,6 +81,14 @@ class AuctionProduct extends BaseModel
         foreach ($b as $k => $v){
             array_push($a, $v); // 卖出商品到最后
         }
+        $orderList = count($orderList) == 0? [] : $orderList->toArray();
+        if ($orderList){
+            foreach ($orderList as $v){
+                $v['status'] = 2;// 已被购买
+                $v['str'] = '已卖完';
+                array_push($a, $v);
+            }
+        }
         return $a;
     }
 

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.15893d0b.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.35a02dac.js></script></body></html>