产品

app/Service/ProductService.php

@@ -133,6 +133,8 @@ class ProductService extends Service
             $model->size = $data['size'] ?? '';
             $model->unit = $data['unit'] ?? 0;
             $model->bar_code = $data['bar_code'] ?? '';
+            $model->cost = $data['cost'] ?? 0;
+            $model->depart_price = $data['depart_price'] ?? 0;
             $model->retail_price = $data['retail_price'] ?? 0;
             $model->mark = $data['mark'] ?? '';
             $model->state = $data['state'] ?? 0;
@@ -225,6 +227,8 @@ class ProductService extends Service
             $model->size = $data['size'] ?? '';
             $model->unit = $data['unit'] ?? 0;
             $model->bar_code = $data['bar_code'] ?? '';
+            $model->cost = $data['cost'] ?? 0;
+            $model->depart_price = $data['depart_price'] ?? 0;
             $model->retail_price = $data['retail_price'] ?? 0;
             $model->mark = $data['mark'] ?? '';
             $model->state = $data['state'] ?? 0;
@@ -389,7 +393,7 @@ class ProductService extends Service
 
     public function productList($data,$user){
         $model = Product::where('del_time',0)
-            ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','state','crt_id','crt_time','mark')
+            ->select('title','id','product_category_id','code','size','unit','bar_code','retail_price','cost','depart_price','state','crt_id','crt_time','mark')
             ->orderby('id', 'desc');
 
         if(! $user['is_main']) {
@@ -416,10 +420,15 @@ class ProductService extends Service
         if(empty($data['title'])) return [false,'产品名称不能为空'];
         if(empty($data['product_category_id'])) return [false,'产品分类不能为空'];
         if(empty($data['code'])) return [false,'产品编码不能为空'];
-        if(! empty($data['retail_price'])){
-            $res = $this->checkNumber($data['retail_price']);
-            if(! $res) return [false,'零售价请输入不超过两位小数的数值'];
-        }
+        if(empty($data['cost'])) return [false,'成本不能为空'];
+        $res = $this->checkNumber($data['cost']);
+        if(! $res) return [false,'成本请输入不超过两位小数的数值'];
+        if(empty($data['depart_price'])) return [false,'分社价格不能为空'];
+        $res = $this->checkNumber($data['depart_price']);
+        if(! $res) return [false,'分社价格请输入不超过两位小数的数值'];
+        if(empty($data['retail_price'])) return [false,'零售价不能为空'];
+        $res = $this->checkNumber($data['retail_price']);
+        if(! $res) return [false,'零售价格请输入不超过两位小数的数值'];
 
         if($is_add){
             $bool = Product::whereRaw("(binary code = '{$data['code']}' OR title = '{$data['title']}')")