wesmiler 抢表商城

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

@@ -20,6 +20,7 @@ class GoodsController extends webApp
     {
         $params = request()->all();
         $pageSize = isset($params['pageSize'])? $params['pageSize'] : 18;
+//        $params['shop_id'] = 3;
         $params['shop_id'] = $this->shopId;
         $params['not_user_id'] = $this->userId;
         $params['is_trade'] = 2;

app/Services/Common/GoodsService.php

@@ -90,7 +90,7 @@ class GoodsService extends BaseService
                 if($type == 1){
                     $query->whereIn('a.id', TradeModel::where(['is_pay'=>2,'status'=>1,'is_out'=>0,'mark'=>1])->pluck('goods_id'));
                 }else if($type == 2){
-                    $query->where(['a.confirm_status'=> 1,'a.is_trade'=>2]);
+                    $query->where(['a.confirm_status'=> 1, 'a.status'=> 1,'a.is_trade'=>2]);
                 }
             })
             ->where(function ($query) use ($params) {
@@ -275,7 +275,9 @@ class GoodsService extends BaseService
         $goods = $this->model->where(['id' => $goodsId, 'mark' => 1])->first();
         $splitNum = isset($goods['split_num']) ? $goods['split_num'] : 0;
         if ($splitNum <= 0) {
-            return false;
+            $splitNum = ConfigService::make()->getConfigByCode('split_num');
+            $splitNum = $splitNum? $splitNum : 2;
+
         }
         // 拆分价
         if($goods['split_price']<=0){
@@ -366,8 +368,8 @@ class GoodsService extends BaseService
         $sourcePrice = isset($goods['source_price']) ? $goods['source_price'] : 0;
         $price = isset($goods['price']) ? $goods['price'] : 0;
         if ($splitNum <= 0) {
-            $this->error = 2066;
-            return false;
+            $splitNum = ConfigService::make()->getConfigByCode('split_num');
+            $splitNum = $splitNum? $splitNum : 2;
         }
 
         // 拆分价

app/Services/Common/MemberService.php

@@ -107,6 +107,8 @@ class MemberService extends BaseService
                     'seconds'=> 0,
                 ];
                 $shopInfo['snap_time'] = $snapTime;
+                $shopInfo['snap_time_lock'] = max(0,$curTime - $startTime);
+                $shopInfo['end_time_lock'] = max(0,$endTime - $startTime);
                 $shopInfo['time_lock'] = 0;
                 $shopInfo['trade_status'] = 2;
 //                if($timeLock ){