挂售

app/admin/controller/auction/Auction.php

@@ -85,10 +85,10 @@ class Auction extends AuthController
             }
             return $menus;
         })->filterable(1)->col(12);
-        $f[] = Form::dateTimes('add_time', '认购开始时间');
-        $f[] = Form::dateTimes('end_time', '认购结束时间');
-        $f[] = Form::dateTimes('radd_time', '支付开始时间');
-        $f[] = Form::dateTimes('rend_time', '支付结束时间');
+        $f[] = Form::dateTimes('add_time', '预约开始时间');
+        $f[] = Form::dateTimes('end_time', '预约结束时间');
+        $f[] = Form::dateTimes('radd_time', '开始时间');
+        $f[] = Form::dateTimes('rend_time', '结束时间');
         $f[] = Form::input('sort', '排序', '0');
         $f[] = Form::input('sort', '排序', '0')->col(12);
         $f[] = Form::input('goods_time', '放货时间(分钟)', '0')->col(12);
@@ -152,10 +152,10 @@ class Auction extends AuthController
             'image.require' => '图片不能为空',
             'status.require' => '状态不能为空',
             'anticipate.require' => '请填写预约价格',
-            'add_time.require' => '请选择认购开始时间价格',
-            'end_time.require' => '请选择认购结束时间价格',
-            'radd_time.require' => '请选择支付开始时间',
-            'rend_time.require' => '请选择支付结束时间',
+            'add_time.require' => '请选择预约开始时间',
+            'end_time.require' => '请选择预约结束时间',
+            'radd_time.require' => '请选择开始时间',
+            'rend_time.require' => '请选择结束时间',
             'auction_gu_id.require' => '请选择绑定场馆',
             'site.require' => '请选择开场日期',
             'goods_time.require' => '请输入放货时间',
@@ -240,10 +240,10 @@ class Auction extends AuthController
         }
 
 
-        $f[] = Form::dateTimes('add_time', '认购开始时间', $data->getData('add_time'));
-        $f[] = Form::dateTimes('end_time', '认购结束时间', $data->getData('end_time'));
-        $f[] = Form::dateTimes('radd_time', '支付开始时间', $data->getData('radd_time'));
-        $f[] = Form::dateTimes('rend_time', '支付结束时间', $data->getData('rend_time'));
+        $f[] = Form::dateTimes('add_time', '预约开始时间', $data->getData('add_time'));
+        $f[] = Form::dateTimes('end_time', '预约结束时间', $data->getData('end_time'));
+        $f[] = Form::dateTimes('radd_time', '开始时间', $data->getData('radd_time'));
+        $f[] = Form::dateTimes('rend_time', '结束时间', $data->getData('rend_time'));
         $f[] = Form::input('sort', '排序', $data->getData('sort'))->col(12);
         $f[] = Form::input('goods_time', '放货时间(分钟)', $data->getData('goods_time'))->col(12);
 
@@ -309,10 +309,10 @@ class Auction extends AuthController
             'image.require' => '图片不能为空',
             'status.require' => '状态不能为空',
             'anticipate.require' => '请填写预约价格',
-            'add_time.require' => '请选择认购开始时间价格',
-            'end_time.require' => '请选择认购结束时间价格',
-            'radd_time.require' => '请选择支付开始时间',
-            'rend_time.require' => '请选择支付结束时间',
+            'add_time.require' => '请选择预约开始时间',
+            'end_time.require' => '请选择预约结束时间',
+            'radd_time.require' => '请选择开始时间',
+            'rend_time.require' => '请选择结束时间',
             'auction_gu_id.require' => '请选择绑定场馆',
             'site.require' => '请选择开场日期',
             'goods_time.require' => '请输入放货时间',

app/admin/model/user/User.php

@@ -246,6 +246,7 @@ class User extends BaseModel
     public static function SaveExcel($list)
     {
         $export = [];
+        $user = User::select();
         foreach ($list as $index => $item) {
             if ($item['is_auth']  == 0 ){
                 $is_auth = '未实名认证';
@@ -259,6 +260,8 @@ class User extends BaseModel
             $pay = AuctionPay::where('uid', $item['uid'])->where('type', 3)->find(); // 银行卡
             $wx = AuctionPay::where('uid', $item['uid'])->where('type', 1)->find(); // 微信
             $zfb = AuctionPay::where('uid', $item['uid'])->where('type', 2)->find(); // 支付宝
+            $count = count(get_downline($user, $item['uid']));
+            $add_time = \app\models\user\User::where('uid', $item['uid'])->value('add_time');
             if (empty($item['phone'])){
                 if ($pay){
                     $item['phone'] = $pay['phone'];
@@ -299,10 +302,12 @@ class User extends BaseModel
                 !empty($wx) ? ' '.$wx['payment'] : '未绑定微信',
                 !empty($zfb) ? ' '.$zfb['payment'] : '未绑定支付宝',
                 $is_auth,
+                date('Y-m-d H:i:s', $add_time),
+                $count
             ];
         }
         PHPExcelService::setExcelHeader(['ID', '账号', '昵称', '手机号','等级', '真实姓名', '身份证号', '余额','易趣卷', '推广人',
-            '商品持仓数量','收益','银行卡', '微信', '支付宝','实名认证'])
+            '商品持仓数量','收益','银行卡', '微信', '支付宝','实名认证','首次登录时间', '下级人数'])
             ->setExcelTile('用户导出' . date('YmdHis', time()), '订单信息' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)
             ->ExcelSave();

app/api/controller/auction/AuctionProductController.php

@@ -92,7 +92,7 @@ class AuctionProductController
         $radd_time = strtotime($auction['radd_time']); // 抢购时间
         if ($user['is_new'] == 1 or ($user['green_time'] >= $time and $user['green_time'] <= $today)){
             // 新人或者绿色通道提前三分钟入场
-            if ($radd_time - 180 > time()){
+            if ($radd_time > time()){
                 return app('json')->fail('未到抢购时间');
             }
         }else if($radd_time > time()){

app/models/auction/AuctionOrder.php

@@ -200,7 +200,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();
+        AuctionTime::where([['product_id', '=', $product['id']]])->delete();
         $productModel->where('id', $product['id'])->save(['is_show' => 0]); //下架等待挂售
 
     }