Quellcode durchsuchen

运输计算提货费总计

hu hao vor 5 Jahren
Ursprung
Commit
3ab6f4ef56

+ 1 - 0
app/Http/Controllers/WaybillController.php

@@ -974,6 +974,7 @@ class WaybillController extends Controller
         $param=$request->input('param');
         $waybills=app('waybillService')->get($param);
         $total_pick_up_fee=$waybills->sum('pick_up_fee');
+        if ($total_pick_up_fee)$total_pick_up_fee=round($total_pick_up_fee);
         return ['success'=>true,'data'=>$total_pick_up_fee];
     }
 

+ 1 - 1
app/Services/WaybillService.php

@@ -185,7 +185,7 @@ class WaybillService
             $waybill['pick_up_fee']=round(($waybill->carrier_weight_other/$daily_total_weight)*$param['billing']);
             $updateParams[] = [
                 'id' => $waybill->id,
-                'pick_up_fee' => bcmul(bcdiv($waybill->carrier_weight_other,$daily_total_weight,2),$param['billing'],2),
+                'pick_up_fee' => ($waybill->carrier_weight_other/$daily_total_weight)*$param['billing'],
                 'updated_at' => Carbon::now()->toDateTimeString(),
             ];
         }

+ 0 - 7
bootstrap/cache/packages.php

@@ -96,13 +96,6 @@
       0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
     ),
   ),
-  'oursdreams/export' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'Oursdreams\\Export\\ExportServiceProvider',
-    ),
-  ),
   'overtrue/laravel-pinyin' => 
   array (
     'providers' => 

+ 18 - 20
bootstrap/cache/services.php

@@ -34,16 +34,15 @@
     30 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
     31 => 'Carbon\\Laravel\\ServiceProvider',
     32 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    33 => 'Oursdreams\\Export\\ExportServiceProvider',
-    34 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    35 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    36 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    37 => 'App\\Providers\\AppServiceProvider',
-    38 => 'App\\Providers\\AuthServiceProvider',
-    39 => 'App\\Providers\\BroadcastServiceProvider',
-    40 => 'App\\Providers\\EventServiceProvider',
-    41 => 'App\\Providers\\HorizonServiceProvider',
-    42 => 'App\\Providers\\RouteServiceProvider',
+    33 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    34 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    35 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    36 => 'App\\Providers\\AppServiceProvider',
+    37 => 'App\\Providers\\AuthServiceProvider',
+    38 => 'App\\Providers\\BroadcastServiceProvider',
+    39 => 'App\\Providers\\EventServiceProvider',
+    40 => 'App\\Providers\\HorizonServiceProvider',
+    41 => 'App\\Providers\\RouteServiceProvider',
   ),
   'eager' => 
   array (
@@ -67,16 +66,15 @@
     17 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
     18 => 'Carbon\\Laravel\\ServiceProvider',
     19 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    20 => 'Oursdreams\\Export\\ExportServiceProvider',
-    21 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    22 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    23 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    24 => 'App\\Providers\\AppServiceProvider',
-    25 => 'App\\Providers\\AuthServiceProvider',
-    26 => 'App\\Providers\\BroadcastServiceProvider',
-    27 => 'App\\Providers\\EventServiceProvider',
-    28 => 'App\\Providers\\HorizonServiceProvider',
-    29 => 'App\\Providers\\RouteServiceProvider',
+    20 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    21 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    22 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    23 => 'App\\Providers\\AppServiceProvider',
+    24 => 'App\\Providers\\AuthServiceProvider',
+    25 => 'App\\Providers\\BroadcastServiceProvider',
+    26 => 'App\\Providers\\EventServiceProvider',
+    27 => 'App\\Providers\\HorizonServiceProvider',
+    28 => 'App\\Providers\\RouteServiceProvider',
   ),
   'deferred' => 
   array (