挂售

app/admin/controller/auction/Auction.php

@@ -8,7 +8,6 @@ use app\admin\model\auction\AuctionProduct as model;
 use app\admin\model\store\StoreProductAttrResult;
 use app\admin\model\store\StoreProductAttrValue;
 use app\admin\model\User;
-use app\models\auction\AuctionTime;
 use app\models\store\StoreProduct;
 use app\models\store\StoreProductAttr;
 use crmeb\services\{ExpressService,
@@ -86,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);
@@ -153,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' => '请输入放货时间',
@@ -241,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);
 
@@ -310,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' => '请输入放货时间',
@@ -446,15 +445,7 @@ class Auction extends AuthController
         $auction_gu = \app\admin\model\auction\AuctionGu::where('id' ,$auction['auction_gu_id'])->find();
         $data['uid'] = $auction_gu['uid'];
         $model = new model();
-        $res = $model->insertGetId($data);
-        $datas = \app\models\auction\AuctionProduct::bs($res);// 获取挂售详情
-        // 新增挂售时间段
-        AuctionTime::create([
-            'uid' => $data['uid'],
-            'product_id' => $res,
-            'auction_id' => $data['auction_id'],
-            'add_time' => strtotime($datas['gs_time'])
-        ]);
+        $res = $model->save($data);
         if ($res){
             return Json::success('添加成功!');
         }else{
@@ -520,16 +511,7 @@ class Auction extends AuthController
         $auction = \app\admin\model\auction\Auction::where('id' ,$data['auction_id'])->find();
         $auction_gu = \app\admin\model\auction\AuctionGu::where('id' ,$auction['auction_gu_id'])->find();
         $data['uid'] = $auction_gu['uid'];
-        $model = new model();
-        $res = $model->insertGetId($data);
-        $datas = \app\models\auction\AuctionProduct::bs($res);// 获取挂售详情
-        // 新增挂售时间段
-        AuctionTime::create([
-            'uid' => $data['uid'],
-            'product_id' => $res,
-            'auction_id' => $data['auction_id'],
-            'add_time' => strtotime($datas['gs_time'])
-        ]);
+        $res = model::create($data);
         if ($res){
             return Json::success('修改成功!');
         }else{

app/admin/controller/auction/AuctionProduct.php

@@ -102,15 +102,7 @@ class AuctionProduct extends AuthController
         $auction_gu = \app\admin\model\auction\AuctionGu::where('id' ,$auction['auction_gu_id'])->find();
         $data['uid'] = $auction_gu['uid'];
         $model = new model();
-        $res = $model->insertGetId($data);
-        $datas = \app\models\auction\AuctionProduct::bs($res);// 获取挂售详情
-        // 新增挂售时间段
-        AuctionTime::create([
-            'uid' => $auction_gu['uid'],
-            'product_id' => $res,
-            'auction_id' => $data['auction_id'],
-            'add_time' => strtotime($datas['gs_time'])
-        ]);
+        $res = $model->save($data);
         if ($res){
             return Json::success('添加成功!');
         }else{
@@ -165,6 +157,7 @@ class AuctionProduct extends AuthController
         }
     }
 
+
     public function edit($id)
     {
         if (!$id) Json::fail('数据不存在');
@@ -288,16 +281,7 @@ class AuctionProduct extends AuthController
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);
-        $model = new model();
-        $res = $model->insertGetId($data);
-        $datas = \app\models\auction\AuctionProduct::bs($res);// 获取挂售详情
-        // 新增挂售时间段
-        AuctionTime::create([
-            'uid' => $data['uid'],
-            'product_id' => $res,
-            'auction_id' => $data['auction_id'],
-            'add_time' => strtotime($datas['gs_time'])
-        ]);
+        $res = model::create($data);
         if ($res){
             return Json::success('修改成功!');
         }else{

app/admin/model/auction/AuctionProduct.php

@@ -63,12 +63,16 @@ class AuctionProduct extends BaseModel
         $data['data'] = $model->select()->toArray();
         foreach ($data['data'] as $k => $v)
         {
-            $time = AuctionTime::where('product_id', $v['id'])->find();
-            if ($time){
-                $data['data'][$k]['time'] = date('Y-m-d', $time['add_time']);
+            if ($v['is_admin'] == 2){
+                $time = AuctionTime::where('product_id', $v['id'])->find();
+                if ($time){
+                    $data['data'][$k]['time'] = date('Y-m-d', $time['add_time']);
+                }else{
+                    $data['data'][$k]['time'] = '未上架';
+
+                }
             }else{
-                $data['data'][$k]['time'] = '未上架';
-
+                $data['data'][$k]['time'] = date('Y-m-d', time());
             }
         }
         return $data;

app/api/controller/auction/AuctionProductController.php

@@ -245,10 +245,10 @@ class AuctionProductController
         if ($order['status'] == 3) return app('json')->fail('该订单已完成');
 
         $order['status'] = 3;
-        AuctionOrder::beginTrans();
-        $res = $order->save();
-        if ($res){
 
+        try {
+            Db::startTrans();
+            $order->save();
             $product = AuctionProduct::find($order['product_id']);
             if (!$product) return app('json')->fail('数据不存在');
             $uid = $product['uid']; // 所属人id
@@ -256,21 +256,16 @@ class AuctionProductController
             $product['uid'] = $order['uid'];// 商品拥有人更新
             $product['add_time'] = time();
             $product['order'] = $data['order_id'];
+            $product['is_show'] = 0;
             $res = $product->save();
-            if ($res){
-                if ($uid > 0){
-                    AuctionOrder::earn($uid,$order['price'] ,$product); // 卖家
-                }
-            }
+            AuctionTime::where([['product_id', '=', $product['id']]])->delete();
             AuctionOrder::return($order['id']); // 买家
-            AuctionOrder::commitTrans();
+            Db::commit();
             return app('json')->successful('完成');
-        }else{
-
-            AuctionOrder::rollbackTrans();
+        } catch (\Exception $e) {
+            Db::rollback();
             return app('json')->fail('失败');
         }
-
     }
 
     /**

app/models/auction/AuctionOrder.php

@@ -443,7 +443,7 @@ class AuctionOrder extends BaseModel
                                 $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();
+                                $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{