wesmiler 抢表商城

app/Http/Controllers/Api/v1/TradeController.php

@@ -45,6 +45,7 @@ class TradeController extends webApp
         $params = request()->all();
         $pageSize = isset($params['pageSize'])? $params['pageSize'] : 18;
         $params['shop_id'] = $this->shopId;
+        $params['time'] = strtotime(date('Y-m-d'));
         $datas = TradeService::make()->getSwitchGoods($params, $pageSize);
         return message(1010, true, $datas);
     }

app/Services/Common/GoodsService.php

@@ -158,12 +158,16 @@ class GoodsService extends BaseService
         if ($isSell > 0) {
             $where['a.is_sell'] = $isSell;
         }
+        $time = strtotime(date('Y-m-d'));
         $list = $this->model->from('trade as a')
             ->leftJoin('member as b', 'b.id', '=', 'a.user_id')
             ->leftJoin('member as c', 'c.id', '=', 'a.sell_uid')
             ->leftJoin('shop as d', 'd.id', '=', 'a.shop_id')
             ->leftJoin('goods as g', 'g.id', '=', 'a.goods_id')
             ->where($where)
+            ->where(function($query)use($time){
+                $query->where('a.pay_time', '>=', $time)->orWhere('a.create_time', '>=', $time);
+            })
             ->where(function ($query) use ($params) {
                 $keyword = isset($params['keyword']) ? $params['keyword'] : '';
                 if ($keyword) {

app/Services/Common/TradeService.php

@@ -233,7 +233,7 @@ class TradeService extends BaseService
             ->where(function ($query) use ($params) {
                 $time = isset($params['time']) ? $params['time'] : '';
                 if ($time) {
-                    $query->where('g.last_sell_time', '<=', $time);
+                    $query->where('a.pay_time', '>=', $time)->orWhere('a.create_time', '>=', $time);
                 }
             })
             ->select(['a.*', 'b.nickname', 'b.code as user_code', 'b.mobile as mobile', 'c.name as shop_name', 'c.code as shop_code','g.goods_name','g.thumb'])