【Mod】修改拼团缺陷

app/Http/Controllers/Admin/RegimentActive.php

@@ -95,7 +95,6 @@ class RegimentActive extends Auth{
             $data['quota']	                = request('quota','');
             $data['name']	                = request('name','');
             $data['number']	                = request('number',0);
-            $expiration_day	                = request('expiration_day',0);
             $expiration_hours	            = request('expiration_hours',0);
             //$data['expiration']	        = $expiration_day * 24 + $expiration_hours;
             $data['expiration']	            = $expiration_hours;
@@ -112,14 +111,14 @@ class RegimentActive extends Auth{
             $data['business_id']	        = request('business_id',0);
             $data['status']			        = 1;
             // 核对产品
-            $product_res                    = $Model::query()->where([['status','=', 1],['product_id','=', $data['product_id']],['end_time','>=', time()]])->first();
+            $product_res                    = $Model->query()->where([['status','=', 1],['product_id','=', $data['product_id']],['end_time','>=', time()]])->first();
             // 提示
             if ($product_res)               return json_send(['code'=>'error','msg'=>'该产品正在参加拼团活动']);
             // 核对产品
-            $product_res                    = $Product::query()->where([['business_id','=', $data['business_id']],['product_id','=', $data['product_id']]])->first();
+            $product_res                    = $Product->query()->where([['business_id','=', $data['business_id']],['id','=', $data['product_id']]])->first();
             if (!$product_res)               return json_send(['code'=>'error','msg'=>'该店铺产品不存在']);
             //核对产品价格
-            $productInfo                    =   $Product->getOne($data['product_id']);
+            $productInfo                    = $Product->getOne($data['product_id']);
             // 如果拼团价格大于产品价格
             if ($productInfo['price'] < $data['regiment_price'])    return json_send(['code'=>'error','msg'=>'拼团价格不能大于产品价格']);
             // 写入数据表