|
@@ -243,7 +243,11 @@ class chctl
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $desc_profit = function ($l, $r) use($out_price) {
|
|
|
+ $formater = function ($val) {
|
|
|
+ return number_format($val,10,'.','');
|
|
|
+ };
|
|
|
+
|
|
|
+ $desc_profit = function ($l, $r) use($out_price,$formater) {
|
|
|
[$lCount,$lRatio] = $l->notify_ratio();
|
|
|
[$rCount,$rRatio] = $r->notify_ratio();
|
|
|
|
|
@@ -253,14 +257,14 @@ class chctl
|
|
|
$lProfitRatio = $lProfit * $lRatio;
|
|
|
$rRrofitRatio = $rRrofit * $rRatio;
|
|
|
|
|
|
- $lProfit = ncPriceFormat($lProfit);
|
|
|
- $rRrofit = ncPriceFormat($rRrofit);
|
|
|
+ $lProfit = $formater($lProfit);
|
|
|
+ $rRrofit = $formater($rRrofit);
|
|
|
|
|
|
- $lProfitRatio = ncPriceFormat($lProfitRatio);
|
|
|
- $rRrofitRatio = ncPriceFormat($rRrofitRatio);
|
|
|
+ $lProfitRatio = $formater($lProfitRatio);
|
|
|
+ $rRrofitRatio = $formater($rRrofitRatio);
|
|
|
|
|
|
- $lRatio = ncPriceFormat($lRatio);
|
|
|
- $rRatio = ncPriceFormat($rRatio);
|
|
|
+ $lRatio = $formater($lRatio);
|
|
|
+ $rRatio = $formater($rRatio);
|
|
|
|
|
|
if($lProfitRatio > $rRrofitRatio) return -1;
|
|
|
elseif($lProfitRatio < $rRrofitRatio) return 1;
|
|
@@ -312,11 +316,11 @@ class chctl
|
|
|
usort($feeds, $desc_profit);
|
|
|
usort($profits, $desc_profit);
|
|
|
|
|
|
- $desctor = function ($item) use($out_price) {
|
|
|
+ $desctor = function ($item) use($out_price,$formater) {
|
|
|
$name = $item->name();
|
|
|
[$count,$ratio] = $item->notify_ratio();
|
|
|
$prifit = $out_price - $item->price();
|
|
|
- $profit_ratio = ncPriceFormat($prifit * $ratio);
|
|
|
+ $profit_ratio = $formater($prifit * $ratio);
|
|
|
return "{$name} count={$count} profit_ratio={$profit_ratio}={$prifit}X{$ratio}";
|
|
|
};
|
|
|
|