youfeng

app/Model/Product.php

@@ -9,5 +9,5 @@ class Product extends UseScopeBaseModel
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
 
-    public static $field = ['title','id','category','code','size','unit','business_cost','write_off_price','cost','write_off_price','crt_id','crt_time','mark','return_change_price'];
+    public static $field = ['title','id','category','code','size','unit','business_cost','write_off_price','cost','write_off_price','crt_id','crt_time','mark','return_change_price','freight_price'];
 }

app/Service/ExportFileService.php

@@ -113,12 +113,13 @@ class ExportFileService extends Service
                         7 => $value['major_client_settlement_price'],
                         8 => $value['write_off_price'],
                         9 => $value['return_change_price'],
-                        10 => $value['mark'],
+                        10 => $value['freight_price'],
+                        11 => $value['mark'],
                     ];
                 }
             });
 
-        $header = ['存货编码','存货名称','规格类型','所属类别','计量单位','成本单价','业务成本单价','大客户结算单价','核销单价','退换货损耗单价','备注'];
+        $header = ['存货编码','存货名称','规格类型','所属类别','计量单位','成本单价','业务成本单价','大客户结算单价','核销单价','退换货损耗单价','运费单价','备注'];
 
         return $this->saveExportData($return,$header);
     }

app/Service/ProductService.php

@@ -2,25 +2,8 @@
 
 namespace App\Service;
 
-use App\Jobs\ProcessDataJob;
-use App\Model\BasicType;
-use App\Model\Depart;
 use App\Model\Employee;
 use App\Model\Product;
-use App\Model\ProductActivity;
-use App\Model\ProductActivityPrice;
-use App\Model\ProductCategory;
-use App\Model\ProductInfo;
-use App\Model\ProductIntroduction;
-use App\Model\ProductInventoryOfTop;
-use App\Model\ProductItemCodeMessage;
-use App\Model\ProductPriceDetail;
-use App\Model\Role;
-use App\Model\RoleMenuButton;
-use App\Model\SeeRange;
-use App\Model\Storehouse;
-use App\Model\U8Job;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -203,7 +186,8 @@ class ProductService extends Service
             $model->cost = $data['cost'] ?? 0;
             $model->write_off_price = $data['write_off_price'] ?? 0;
             $model->major_client_settlement_price = $data['major_client_settlement_price'] ?? 0;
-            $model->return_change_price = $data['return_change_price'] ?? "";
+            $model->return_change_price = $data['return_change_price'] ?? 0;
+            $model->freight_price = $data['freight_price'] ?? 0;
             $model->mark = $data['mark'] ?? '';
             $model->save();
 
@@ -239,7 +223,8 @@ class ProductService extends Service
             $model->cost = $data['cost'] ?? 0;
             $model->write_off_price = $data['write_off_price'] ?? 0;
             $model->major_client_settlement_price = $data['major_client_settlement_price'] ?? 0;
-            $model->return_change_price = $data['return_change_price'] ?? "";
+            $model->return_change_price = $data['return_change_price'] ?? 0;
+            $model->freight_price = $data['freight_price'] ?? 0;
             $model->mark = $data['mark'] ?? '';
             $model->crt_id = $user['id'];
             $model->save();
@@ -273,7 +258,7 @@ class ProductService extends Service
             return [false,$exception->getMessage()];
         }
 
-        return [true, ['file' => ['old' => $old]]];
+        return [true, ''];
     }
 
     /**
@@ -364,6 +349,10 @@ class ProductService extends Service
             $res = $this->checkNumber($data['return_change_price']);
             if(! $res) return [false,'退货损耗单价请输入不超过两位小数并且大于等于0的数值'];
         }
+        if(! empty($data['freight_price'])){
+            $res = $this->checkNumber($data['freight_price']);
+            if(! $res) return [false,'运费单价请输入不超过两位小数并且大于等于0的数值'];
+        }
 
         if($is_add){
             $bool = Product::where('code', $data['code'])

config/excel/productTable.php

@@ -59,6 +59,12 @@ return [
         'required' => false,
         'default' => 0,
     ],
+    [
+        'key' => 'freight_price',
+        'value' => '运费单价',
+        'required' => false,
+        'default' => 0,
+    ],
     [
         'key' => 'mark',
         'value' => '备注',

config/header/62.php

@@ -46,6 +46,10 @@ return [
         'key' => 'return_change_price',
         'value' => '退货损耗单价',
     ],
+    [
+        'key' => 'freight_price',
+        'value' => '运费单价',
+    ],
     [
         'key' => 'mark',
         'value' => '备注',