退回,扣除一小时未上传

app/admin/controller/auction/Auction.php

@@ -113,7 +113,7 @@ class Auction extends AuthController
         if (!$id) Json::fail('删除失败');
         $model = new \app\admin\model\auction\Auction();
 
-        $res = $model->where('id', $id)->useSoftDelete('delete_time',time())->delete();
+        $res = $model->where('id', $id)->delete();
         if ($res){
             return Json::success('删除成功!');
         }else{

app/admin/view/auction/auction/edit.php

@@ -483,7 +483,6 @@
             getProductInfo: function () {
                 var that = this;
                 that.requestGet(that.U({c:"auction.auction",a:'get_auction',q:{id:that.id}})).then(function (res) {
-
                     var productInfo = res.data.productInfo || {};
                     if(productInfo.id && that.id){
                         that.$set(that,'formData',productInfo);

app/api/controller/auction/AuctionController.php

@@ -222,7 +222,7 @@ class AuctionController
             [['limit', 'd'], 0],
         ], $request);
 
-        $list = AuctionGu::where('uid', $request->uid())->select();
+        $list = AuctionGu::where('uid', $request->uid())->page($data['page'], $data['limit'])->select();
         $list = count($list) ? $list->toArray() : [];
 
         return app('json')->successful($list);

app/api/controller/auction/AuctionProductController.php

@@ -215,7 +215,6 @@ class AuctionProductController
                 }
             }
             AuctionOrder::return($order['id']); // 买家
-
             AuctionOrder::commitTrans();
             return app('json')->successful('完成');
         }else{

app/http/middleware/AllowOriginMiddleware.php

@@ -4,9 +4,12 @@
 namespace app\http\middleware;
 
 
+use app\models\auction\Auction;
+use app\models\auction\AuctionOrder;
 use app\Request;
 use crmeb\interfaces\MiddlewareInterface;
 use think\facade\Config;
+use think\facade\Db;
 use think\Response;
 
 /**
@@ -53,6 +56,22 @@ class AllowOriginMiddleware implements MiddlewareInterface
             $response = $next($request)->header($header);
         }
         $request->filter(['htmlspecialchars', 'strip_tags', 'addslashes', 'trim']);
+        Auction::frequency(); // 更新场次
+        try {
+            Db::startTrans();
+            AuctionOrder::deduction();//订单一个小时内未上传扣除预约卷
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+        }
+
+        try {
+            Db::startTrans();
+//            AuctionOrder::th();//退回预约卷
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+        }
         return $response;
     }
 }

app/models/auction/Auction.php

@@ -62,4 +62,17 @@ class Auction extends BaseModel
         return $list;
     }
 
+    public static function frequency()
+    {
+        $list = self::select();
+        foreach ($list as $k => $v){
+            if ($v['day_time'] < time()){
+                $find = self::find($v['id']);
+                $find['day_time'] = strtotime(date('Y-m-d 11:59:59'));
+                $find['frequency'] = $v['frequency'] + 1;
+                $find->save();
+            }
+        }
+    }
+
 }

app/models/auction/AuctionOrder.php

@@ -208,17 +208,16 @@ class AuctionOrder extends BaseModel
 
                 $auction = Auction::where('id', $product['auction_id'])->find();
 
-                $booking = AuctionBooking::whereBetweenTime('create_time',date('Y-m-d H:i:s',  strtotime(date('Y-m-d', time()))), date('Y-m-d H:i:s', strtotime(date('Y-m-d', strtotime('+1 day')))))
-                    ->where([['uid', '=', $v['uid']], ['status', '=', 1], ['auction_id', '=', $auction['id']]])->where('status', '=', 1)->find();
-                $user = \app\models\user\User::where('uid', $v['collection_id'])->find();
-
-                $user['anticipate'] = $user['anticipate'] + $auction['anticipate'];
-                UserBill::income('增加预约卷', $v['collection_id'], 'anticipate', 'add_anticipate',  $auction['anticipate'], $v['uid'], $user['anticipate'], '卖出订单未上传支付凭证,增加'.$auction['anticipate'].'预约卷');
-
-                $user->save();
-                AuctionBooking::where('id', $booking['id'])->update(['status' => 0]);
-                AuctionOrder::where('create_time', '<', $hour)->where('status', '=', 1)->update(['status' => 2]); // 修改为已过期订单
+                $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']; // 增加预约卷
+                    UserBill::income('增加预约卷', $v['collection_id'], 'anticipate', 'add_anticipate',  $auction['anticipate'], $v['uid'], $user['anticipate'], '卖出订单未上传支付凭证,增加'.$auction['anticipate'].'预约卷');
 
+                    $user->save();
+                    AuctionBooking::where('id', $booking['id'])->update(['status' => 2]); // 修改预约订单状态 为扣除
+                }
+                AuctionOrder::where('create_time', '<', $hour)->where('status', '=', 1)->update(['status' => 0]); // 修改为已过期订单
             }
 
         }
@@ -236,13 +235,20 @@ class AuctionOrder extends BaseModel
         $auction = Auction::where('rend_time', '<', time())->select();
         if ($auction){
             foreach ($auction as $k => $v){
-                $booking = AuctionBooking::where('auction_id', $v['id'])->whereBetweenTime('create_time',date('Y-m-d H:i:s',  strtotime(date('Y-m-d', time()))), date('Y-m-d H:i:s', strtotime(date('Y-m-d', strtotime('+1 day')))))->select();
+
+                $booking = AuctionBooking::where([['auction_id', '=', $v['id']], ['status','=' , 1]])->select();
                 if ($booking){
-                    $user = User::where('uid', $booking['uid'])->find();
-                    $user['anticipate'] = $user['anticipate'] + $booking['anticipate'];
-                    $user->save();
-                    UserBill::income('预约卷增加',$user['uid'], 'anticipate', 'add_anticipate', $booking['anticipate'], 0, $user['anticipate'], '预约卷退回');
+                    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'], '预约卷退回');
+                    }
                 }
             }
         }