【Add】修改产品起购后台管理

app/Http/Controllers/Admin/Product.php

@@ -255,6 +255,8 @@ class Product extends Auth{
 			$data['business_id']	= request('business_id',0);
 			$data['quota']			= request('quota',0);
 			$data['min_quota']		= request('min_quota',0);
+			$data['hide_orderbtn']	= request('hide_orderbtn',0);
+			$data['sku_min_quota_and'] = request('sku_min_quota_and',0);
 			$data['quota_start']	= request('quota_start','');
 			$data['quota_end']		= request('quota_end','');
 			$data['puton_time']		= request('puton_time','');
@@ -297,9 +299,7 @@ class Product extends Auth{
 					// SKU限购，所以限购时间也必须填
 					if( $value['quota'] && ( !$data['quota_start'] || !$data['quota_end'] )) return json_send(['code'=>'error','msg'=>'SKU限购时，请填限购时间','data'=>['error'=>'SKU限购时，请填限购时间']]);
 					// 限购提示
-					if(  $value['quota'] && $value['min_quota'] > $value['quota'] ) 	return json_send(['code'=>'error','msg'=>$attrNames.'起购数量请勿大于限购数量','data'=>['error'=>$attrNames.'起购数量请勿大于限购数量']]);
-					// 提示起购数量异常,如果总起购数量小于SKU起购数量，提示
-					if( $value['min_quota'] && $value['min_quota'] < $data['min_quota'] ) return json_send(['code'=>'error','msg'=>'SKU的起购数量不能小于总起购数量','data'=>['error'=>'SKU的起购数量不能小于总起购数量']]);
+					if(  $value['quota'] && $value['min_quota'] > $value['quota'] ) 		 return json_send(['code'=>'error','msg'=>$attrNames.'起购数量请勿大于限购数量','data'=>['error'=>$attrNames.'起购数量请勿大于限购数量']]);
 				}
 				// 限购数量
 				$quota 				= array_sum(array_column($skuList,'quota'));
@@ -482,6 +482,8 @@ class Product extends Auth{
 			$data['market_price']	= request('market_price',0);
 			$data['quota']			= request('quota',0);
 			$data['min_quota']		= request('min_quota',0);
+			$data['hide_orderbtn']	= request('hide_orderbtn',0);
+			$data['sku_min_quota_and'] = request('sku_min_quota_and',0);
 			$data['quota_start']	= request('quota_start','');
 			$data['quota_end']		= request('quota_end','');
 			$data['puton_time']		= request('puton_time','');
@@ -526,8 +528,6 @@ class Product extends Auth{
 					if( $value['quota'] && ( !$data['quota_start'] || !$data['quota_end'] )) 	return json_send(['code'=>'error','msg'=>'SKU限购时，请填限购时间','data'=>['error'=>'SKU限购时，请填限购时间']]);
 					// 限购提示
 					if(  $value['quota'] && $value['min_quota'] > $value['quota'] ) 	return json_send(['code'=>'error','msg'=>$attrNames.'起购数量请勿大于限购数量','data'=>['error'=>$attrNames.'起购数量请勿大于限购数量']]);
-					// 提示起购数量异常,如果总起购数量小于SKU起购数量，提示
-					if( $value['min_quota'] && $value['min_quota'] < $data['min_quota'] ) 	return json_send(['code'=>'error','msg'=>'SKU的起购数量不能小于总起购数量','data'=>['error'=>'SKU的起购数量不能小于总起购数量']]);
 				}
 				// 限购数量
 				$quota 				= array_sum(array_column($skuList,'quota'));
@@ -735,6 +735,8 @@ class Product extends Auth{
 			$data['business_id']	= request('business_id',0);
 			$data['quota']			= request('quota',0);
 			$data['min_quota']		= request('min_quota',0);
+			$data['hide_orderbtn']	= request('hide_orderbtn',0);
+			$data['sku_min_quota_and'] = request('sku_min_quota_and',0);
 			$data['quota_start']	= request('quota_start','');
 			$data['quota_end']		= request('quota_end','');
 			$data['puton_time']		= request('puton_time','');
@@ -780,8 +782,6 @@ class Product extends Auth{
 					if( $value['quota'] && ( !$data['quota_start'] || !$data['quota_end'] )) 	return json_send(['code'=>'error','msg'=>'SKU限购时，请填限购时间','data'=>['error'=>'SKU限购时，请填限购时间']]);
 					// 限购提示
 					if(  $value['quota'] && $value['min_quota'] > $value['quota'] ) 	return json_send(['code'=>'error','msg'=>$attrNames.'起购数量请勿大于限购数量','data'=>['error'=>$attrNames.'起购数量请勿大于限购数量']]);
-					// 提示起购数量异常,如果总起购数量小于SKU起购数量，提示
-					if( $value['min_quota'] && $value['min_quota'] < $data['min_quota'] ) 	return json_send(['code'=>'error','msg'=>'SKU的起购数量不能小于总起购数量','data'=>['error'=>'SKU的起购数量不能小于总起购数量']]);
 				}
 				// 限购数量
 				$quota 				= array_sum(array_column($skuList,'quota'));

app/Http/Controllers/Api/Product.php

@@ -191,7 +191,7 @@ class Product extends Api{
 		// 显示
 		$map[]						= ['status','=','0'];
 		// 查询
-		$data   					= $Model->query()->where($map)->find($id,['id','name','thumb','stock','spec','poster','price','business_id','market_price']);
+		$data   					= $Model->query()->where($map)->find($id,['id','hide_orderbtn','name','thumb','stock','spec','poster','price','business_id','market_price']);
 		// 如果没有数据
         if( !$data )                return json_send(['code'=>'error','msg'=>'产品已下架','data'=>['error'=>'产品已下架或不存在']]);
         // 允许城市
@@ -218,7 +218,7 @@ class Product extends Api{
 		// 规格属性
 		$specAttr					= [];
 		// 获取数据
-		foreach ($attr as $value) {
+		foreach ($attr as $value)  {
 			// 默认未选中
 			$value['active']		= 0;
 			$specAttr[$value['spec_id']]['spec_id']		= $value['spec_id'];

app/Models/Product.php

@@ -162,7 +162,7 @@ class Product extends Model
         // 写入数据表
         $data				    = $this->query();
         if( $citys )            $data = $data->join('product_city','product_city.product_id','=','product.id')->whereIn('product_city.city_id',$citys);
-        $data				    = $data->whereIn('product.id',$productIds)->where([['product.status','=',0]])->get(['product.id','product.name as product_name','product.thumb as product_thumb','product.spec as sku_attr_names','product.price','product.stock','product.status','product.business_id','product.quota','product.min_quota','product.quota_start','product.quota_end','product.tag_scope','product.tag_exclude'])->toArray();
+        $data				    = $data->whereIn('product.id',$productIds)->where([['product.status','=',0]])->get(['product.id','product.name as product_name','product.thumb as product_thumb','product.spec as sku_attr_names','product.price','product.stock','product.status','product.business_id','product.quota','product.min_quota','sku_min_quota_and','product.quota_start','product.quota_end','product.tag_scope','product.tag_exclude'])->toArray();
         // 列表
         $list                   = [];
         // 循环处理