feat: 马豆全端展示统一为整数格式
这个提交包含在:
@@ -62,7 +62,7 @@ class Dashboard extends Common
|
||||
})
|
||||
];
|
||||
|
||||
// 2. 合伙股东基础数据 (保持向下兼容)
|
||||
// 2. 收益中心成员基础数据 (保持向下兼容)
|
||||
$agentData = [
|
||||
'total' => Agent::count(),
|
||||
'today' => Agent::whereTime('createtime', 'today')->count(),
|
||||
@@ -307,7 +307,7 @@ class Dashboard extends Common
|
||||
'badge' => '普',
|
||||
'color' => '#8c8c8c',
|
||||
'user_count' => $normalUserCount,
|
||||
'madow_total' => '0.00000000',
|
||||
'madow_total' => '0',
|
||||
'madow_cny' => '0.00',
|
||||
'madow_cny_raw' => 0.0,
|
||||
'reward_amount' => '0.00',
|
||||
@@ -448,9 +448,9 @@ class Dashboard extends Common
|
||||
|
||||
foreach ($allAgents as $ag) {
|
||||
$identityData = IdentityService::build($ag);
|
||||
// 核心业务规范:合伙股东仅是会员体系下的专属进阶身份(创客V1~V6、酒道馆、区县代理)
|
||||
// 普通会员与品酒师属于基础会员,无需自购考核,排除在股东自购掉队雷达之外
|
||||
if (empty($identityData['is_partner'])) {
|
||||
// 核心业务规范:进阶角色(创客V1~V6、酒道馆、区县代理、合伙股东)需按月履行自购以维持分润资格
|
||||
// 普通会员与品酒师属于基础会员,无需自购考核,排除在自购掉队雷达之外
|
||||
if (empty($identityData['is_advanced'])) {
|
||||
continue;
|
||||
}
|
||||
$partnerShareholderCount++;
|
||||
@@ -579,7 +579,7 @@ class Dashboard extends Common
|
||||
$riskSuggestions[] = "分成支出占比 {$payoutRate}% 超出常规合理范围,请检查各层级分成与日结奖励设置。";
|
||||
}
|
||||
if ($warningPartnersCount > 0) {
|
||||
$riskSuggestions[] = "有 {$warningPartnersCount} 位合伙股东 7 天内自购即将到期,建议及时提醒自购维持资格。";
|
||||
$riskSuggestions[] = "有 {$warningPartnersCount} 位进阶成员(创客/馆/县/股东)7 天内自购即将到期,建议及时提醒自购维持资格。";
|
||||
}
|
||||
if ($pendingWithdrawCount > 0) {
|
||||
$riskSuggestions[] = "当前有 {$pendingWithdrawCount} 笔提现申请等待审核(¥{$financeOverview['pending_withdraw_amount']}),请及时处理。";
|
||||
|
||||
@@ -196,7 +196,7 @@ class Order extends Common
|
||||
}
|
||||
|
||||
/**
|
||||
* 合伙股东分成明细:即时奖列人;均分只汇总人数/人均
|
||||
* 收益中心分成明细:即时奖列人;均分只汇总人数/人均
|
||||
*/
|
||||
protected function buildPartnerSplit($order)
|
||||
{
|
||||
@@ -217,7 +217,7 @@ class Order extends Common
|
||||
$totalCash = 0;
|
||||
$totalVoucher = 0;
|
||||
|
||||
// 1. 查询合伙股东即时收益流水
|
||||
// 1. 查询即时收益流水
|
||||
$rows = \app\admin\model\shopro\partner\Reward::with(['user'])
|
||||
->where('order_id', $orderId)
|
||||
->order('id', 'asc')
|
||||
@@ -357,7 +357,7 @@ class Order extends Common
|
||||
'user' => null,
|
||||
'user_count' => 0,
|
||||
'each_amount' => '0.00',
|
||||
'each_madow' => '0.00000000',
|
||||
'each_madow' => '0',
|
||||
'total_amount' => number_format($platAmount, 2, '.', ''),
|
||||
'total_madow' => \addons\shopro\service\partner\IdentityService::formatMadow($platMadow),
|
||||
'amount_text' => $amountText,
|
||||
|
||||
@@ -83,7 +83,7 @@ class Reward extends Common
|
||||
'reward_type_text' => $reward['reward_type_text'],
|
||||
'role_text' => $reward['role_text'] ?? $reward['role'],
|
||||
'amount' => $reward['amount'],
|
||||
'madow' => $reward['madow'],
|
||||
'madow' => \addons\shopro\service\partner\IdentityService::formatMadow($reward['madow']),
|
||||
'base_amount' => $reward['base_amount'],
|
||||
'status_text' => $reward['status_text'],
|
||||
'formula' => $reward['formula'],
|
||||
@@ -92,6 +92,7 @@ class Reward extends Common
|
||||
$totalAmount += array_sum(array_column($newDatas, 'amount'));
|
||||
$totalMadow += array_sum(array_column($newDatas, 'madow'));
|
||||
if ($pages['is_last_page']) {
|
||||
$formattedTotalMadow = \addons\shopro\service\partner\IdentityService::formatMadow($totalMadow);
|
||||
$newDatas[] = [
|
||||
'id' => '财务合计',
|
||||
'createtime' => '-',
|
||||
@@ -101,10 +102,10 @@ class Reward extends Common
|
||||
'reward_type_text' => '-',
|
||||
'role_text' => '-',
|
||||
'amount' => number_format($totalAmount, 2, '.', ''),
|
||||
'madow' => number_format($totalMadow, 8, '.', ''),
|
||||
'madow' => $formattedTotalMadow,
|
||||
'base_amount' => '-',
|
||||
'status_text' => '已汇总',
|
||||
'formula' => "总现金: {$totalAmount}, 总马豆: {$totalMadow}",
|
||||
'formula' => "总现金: {$totalAmount}, 总马豆: {$formattedTotalMadow}",
|
||||
];
|
||||
}
|
||||
return $newDatas;
|
||||
|
||||
在新工单中引用
屏蔽一个用户