提交的代码

This commit is contained in:
youda 2025-04-20 12:01:00 +08:00
parent da7db72158
commit a5b6906dad
2 changed files with 10 additions and 7 deletions

View File

@ -26,7 +26,7 @@ class Config extends Base
return $this->renderSuccess('获取成功', [
'good_type' => $goodsTypeList,
'app_setting' => $app_setting,
'version' => '103'
'version' => '104'
]);
}

View File

@ -220,6 +220,9 @@ class RankService
if ($endTime > 0) {
$where[] = ['addtime', '<=', $endTime];
}
if($limit==10){
$limit=200;
}
$list = OrderListRecovery::where($where)
->field('user_id, sum(money) as use_money')
->group('user_id')
@ -247,7 +250,7 @@ class RankService
'user_id' => $item['user_id'],
'nickname' => $userInfo['nickname'],
'headimg' => imageUrl($userInfo['headimg']),
'value' => $item['use_money']*100,
'value' => intval($item['use_money'] * 100),
'unit' => '达达卷'
];
}
@ -365,7 +368,7 @@ class RankService
$outputMoneyWhere[] = ['addtime', '<=', $endTime];
}
$outputMoneyWhere[] = ['user_id', '=', $userId];
$outputMoney = Db::name('order_list')
->where($outputMoneyWhere)
->sum('goodslist_money');
@ -379,17 +382,17 @@ class RankService
$dadaMoneyWhere[] = ['addtime', '<=', $endTime];
}
$dadaMoneyWhere[] = ['user_id', '=', $userId];
$dadaMoney = Db::name('order_list_recovery')
->where($dadaMoneyWhere)
->sum('money');
// 如果dadaMoney为null设置为0
$dadaMoney = $dadaMoney ?: 0;
// 计算亏损金额:(出货金额-(微信消费金额+达达卷金额))
$lossMoney = $outputMoney - ($money + $dadaMoney);
// 计算亏损率
$totalConsume = $money + $dadaMoney;
$lossRate = $totalConsume > 0 ? round(($lossMoney / $totalConsume) * 100, 2) : 0;
@ -423,7 +426,7 @@ class RankService
if ($userInfo) {
// 取亏损金额的绝对值来显示
$absoluteLossMoney = abs($item['loss_money']);
$result[] = [
'rank' => $offset + $index + 1,
'user_id' => $item['user_id'],