1

app/Service/ImportService.php

@@ -568,8 +568,8 @@ class ImportService extends Service
                 $tmp['unit'] = $basic[$value['4']];
             }
             $tmp['bar_code'] = $value['5'];
-            $tmp['cost'] = $value['6'];
-            $tmp['retail_price'] = $value['7'];
+            $tmp['cost'] = $value['6'] ?? 0;
+            $tmp['retail_price'] = $value['7'] ?? 0;
             $tmp['product_attribute'] = $value['8'] ?? 0;
             foreach ($map as $m => $v){
                 if($value[$v['col']]){

app/Service/ProductService.php

@@ -649,12 +649,12 @@ 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['cost'])) return [false,'成本不能为空'];
+        if(! isset($data['cost'])) return [false, '请填写成本'];
+        if(! isset($data['retail_price'])) return [false, '请填写零售价'];
         $res = $this->checkNumber($data['cost']);
-        if(! $res) return [false,'成本请输入不超过两位小数并且大于0的数值'];
-        if(empty($data['retail_price'])) return [false,'零售价不能为空'];
+        if(! $res) return [false,'成本请输入不超过两位小数并且大于等于0的数值'];
         $res = $this->checkNumber($data['retail_price']);
-        if(! $res) return [false,'零售价格请输入不超过两位小数并且大于0的数值'];
+        if(! $res) return [false,'零售价格请输入不超过两位小数并且大于等于0的数值'];
         if(! empty($data['product_price'])){
             $map = BasicType::whereIn('id',array_column($data['product_price'],'basic_type_id'))
                 ->pluck('title','id')