|
@@ -177,7 +177,7 @@ class WaybillService
|
|
|
if ($waybills->isEmpty()) return '无数据';
|
|
if ($waybills->isEmpty()) return '无数据';
|
|
|
foreach ($waybills as $waybill){
|
|
foreach ($waybills as $waybill){
|
|
|
if (!$waybill['carrier_weight_other'] && !$waybill['carrier_weight']) return null;
|
|
if (!$waybill['carrier_weight_other'] && !$waybill['carrier_weight']) return null;
|
|
|
- if (!$waybill['carrier_weight_other']) $waybill['carrier_weight_other']=($waybill['carrier_weight']/0.004);
|
|
|
|
|
|
|
+ if (!$waybill['carrier_weight_other']) $waybill['carrier_weight_other']=($waybill['carrier_weight']/0.25*100);
|
|
|
}
|
|
}
|
|
|
$daily_total_weight=$waybills->sum('carrier_weight_other');
|
|
$daily_total_weight=$waybills->sum('carrier_weight_other');
|
|
|
$updateParams = [['id','pick_up_fee','updated_at']];
|
|
$updateParams = [['id','pick_up_fee','updated_at']];
|