|
@@ -238,13 +238,16 @@ class SettleService extends BaseService
|
|
|
$lsScoreRate = $lsScoreRate > 0 && $lsScoreRate <= 50 ? $lsScoreRate : $ptLsScoreRate;
|
|
$lsScoreRate = $lsScoreRate > 0 && $lsScoreRate <= 50 ? $lsScoreRate : $ptLsScoreRate;
|
|
|
//$profitTotal = isset($goods['profit_total']) ? $goods['profit_total'] : 0;
|
|
//$profitTotal = isset($goods['profit_total']) ? $goods['profit_total'] : 0;
|
|
|
$netProfit = isset($goods['net_profit']) ? $goods['net_profit'] : 0;
|
|
$netProfit = isset($goods['net_profit']) ? $goods['net_profit'] : 0;
|
|
|
|
|
+ $score = 0;
|
|
|
if ($netProfit > 0 && $lsScoreRate > 0) {
|
|
if ($netProfit > 0 && $lsScoreRate > 0) {
|
|
|
- $lsScoreTotal += moneyFormat($netProfit * $lsScoreRate / 100, 2);
|
|
|
|
|
|
|
+ $score = moneyFormat($netProfit * $lsScoreRate / 100, 2);
|
|
|
|
|
+ $lsScoreTotal += floatval($score);
|
|
|
}
|
|
}
|
|
|
$data['ls_score_rates'][$goods['goods_id']] = [
|
|
$data['ls_score_rates'][$goods['goods_id']] = [
|
|
|
'goods_id' => $goods['goods_id'],
|
|
'goods_id' => $goods['goods_id'],
|
|
|
'net_profit' => $netProfit,
|
|
'net_profit' => $netProfit,
|
|
|
- 'score' => $lsScoreRate
|
|
|
|
|
|
|
+ 'score' => $score,
|
|
|
|
|
+ 'score_rate' => $lsScoreRate
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|