Просмотр исходного кода

Merge branch 'dev' of wugg/cxinv into master

wugg 2 лет назад
Родитель
Сommit
504d81ea4e
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      app/command/reportTips.php

+ 4 - 4
app/command/reportTips.php

@@ -59,8 +59,8 @@ class reportTips extends Command
 			$t['dtotal']=sprintf( "%.2f",$day_total[$key]??0);
 			$t['thfee']= sprintf( "%.2f",$day_thtotal[$key]??0);
 			$t['tips']= sprintf( "%.2f",$value['total_tips']??0);
-			$t["rate"]=number_format( $t['mtotal']/$value['total_tips']*100,2);
-			$t["thrate"]=number_format( $t['thtotal']/$value['total_tips']*100,2);
+			$t["rate"]=$value['total_tips']??number_format( $t['mtotal']/$value['total_tips']*100,2);
+			$t["thrate"]=$value['total_tips']??number_format( $t['thtotal']/$value['total_tips']*100,2);
 			$data[]=$t;
         }
         $temp['thtotal'] = sprintf( "%.2f",array_sum(array_column($data,'thtotal')));
@@ -71,8 +71,8 @@ class reportTips extends Command
         $temp['dtotal'] = sprintf( "%.2f",array_sum(array_column($data,'dtotal')));
         $temp['thfee'] = sprintf( "%.2f",array_sum(array_column($data,'thfee')));
         $temp['tips'] = sprintf( "%.2f",array_sum(array_column($data,'tips')));
-        $temp["rate"]=number_format( $temp['mtotal']/$temp['tips']*100,2);
-		$temp["thrate"]=number_format( $temp['thtotal']/$temp['tips']*100,2);
+        $temp["rate"]=$temp['tips']??number_format( $temp['mtotal']/$temp['tips']*100,2);
+		$temp["thrate"]=$temp['tips']??number_format( $temp['thtotal']/$temp['tips']*100,2);
 
 		$sort = array_column($data,"thrate");
         array_multisort($sort,SORT_DESC,$data);