|
|
@@ -246,6 +246,7 @@ class ProductService extends Service
|
|
|
$model->bar_code = $data['bar_code'] ?? '';
|
|
|
$model->cost = $data['cost'] ?? 0;
|
|
|
$model->retail_price = $data['retail_price'] ?? 0;
|
|
|
+ $model->build_fee = $data['build_fee'] ?? 0;
|
|
|
$model->mark = $data['mark'] ?? '';
|
|
|
$model->state = $data['state'] ?? 0;
|
|
|
$model->product_attribute = $data['product_attribute'] ?? 0;
|
|
|
@@ -366,6 +367,7 @@ class ProductService extends Service
|
|
|
$model->bar_code = $data['bar_code'] ?? '';
|
|
|
$model->cost = $data['cost'] ?? 0;
|
|
|
$model->retail_price = $data['retail_price'] ?? 0;
|
|
|
+ $model->build_fee = $data['build_fee'] ?? 0;
|
|
|
$model->mark = $data['mark'] ?? '';
|
|
|
$model->state = $data['state'] ?? 0;
|
|
|
$model->product_attribute = $data['product_attribute'] ?? 0;
|
|
|
@@ -591,7 +593,7 @@ class ProductService extends Service
|
|
|
public function productListIndex($data,$user){
|
|
|
$model = Product::ProductClear($user,$data);
|
|
|
$model = $model->where('del_time',0)
|
|
|
- ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','state','crt_id','crt_time','mark','depart_id','top_depart_id','install_time','product_attribute','is_use')
|
|
|
+ ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','state','crt_id','crt_time','mark','depart_id','top_depart_id','install_time','product_attribute','is_use','build_fee')
|
|
|
->orderby('product_attribute', 'desc')
|
|
|
->orderby('id', 'desc');
|
|
|
|
|
|
@@ -636,7 +638,7 @@ class ProductService extends Service
|
|
|
public function productList($data,$user){
|
|
|
$model = Product::ProductClear($user,$data);
|
|
|
$model = $model->where('del_time',0)
|
|
|
- ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','state','crt_id','crt_time','mark','depart_id','top_depart_id','install_time','product_attribute','is_use')
|
|
|
+ ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','state','crt_id','crt_time','mark','depart_id','top_depart_id','install_time','product_attribute','is_use','build_fee')
|
|
|
->where('is_use', Product::is_use_one)
|
|
|
->orderby('product_attribute', 'desc')
|
|
|
->orderby('id', 'desc');
|
chenqp