jun 4 месяцев назад
Родитель
Сommit
ec9020e565

+ 1 - 1
app/Http/Controllers/Admin/RegimentActive.php

@@ -116,7 +116,7 @@ class RegimentActive extends Auth{
             // 提示
             if ($product_res)               return json_send(['code'=>'error','msg'=>'该产品正在参加拼团活动']);
             // 核对产品
-            $product_res                    = $Model::query()->where([['business_id','=', $data['business_id']],['product_id','=', $data['product_id']]])->first();
+            $product_res                    = $Product::query()->where([['business_id','=', $data['business_id']],['product_id','=', $data['product_id']]])->first();
             if (!$product_res)               return json_send(['code'=>'error','msg'=>'该店铺产品不存在']);
             //核对产品价格
             $productInfo                    =   $Product->getOne($data['product_id']);

+ 1 - 1
app/Http/Controllers/Admin/RegimentRecord.php

@@ -79,7 +79,7 @@ class RegimentRecord extends Auth{
             ->join('regiment_active','regiment_active.id','=','regiment_record.active_id')
             ->join('product','product.id','=','regiment_record.product_id')
             ->join('custom','custom.uid','=','regiment_record.custom_uid');
-        if (isset($shopIds)){
+        if ($shopIds){
             $list               = $list->whereIn('regiment_active.business_id',$shopIds);
         }
         $list					= $list->where($map)