wikiboss/Henglianshutong
1
0
派生 0
代码 工单 合并请求 Actions 软件包 项目 版本发布 百科 动态

feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐

浏览代码
这个提交包含在：
chen
2026-09-19 11:49:57 +08:00
父节点 85947e43ae
当前提交 aca0d3c671
共有 83 个文件被更改，包括 4146 次插入 和 443 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

30
application/admin/model/shopro/user/WalletLog.php
查看文件

@@ -45,16 +45,16 @@ class WalletLog extends Common
'transfer_by_commission' => '服务收益-转入到余额',
'reward_income' => '收益分成-入账',
'reward_back' => '收益分成-退还',
'push3' => '推荐开拓奖',
'push3' => '推荐提成',
'maker_diff' => '创客进阶奖',
'maker_peer' => '创客协同奖',
'maker_overtaken' => '创客卓越奖',
'team_venue' => '酒道馆运营奖',
'team_county' => '区县统筹奖',
'venue_peer' => '酒道馆协同奖',
'county_peer' => '区县协同奖',
'venue_share' => '酒道馆加权奖励',
'county_share' => '区县加权奖励'
'team_venue' => '酒道馆管理奖',
'team_county' => '区县管理奖',
'venue_peer' => '酒道馆平级奖',
'county_peer' => '区县代平级奖',
'venue_share' => '酒道馆加权奖',
'county_share' => '区县加权奖'
],
'commission' => [
'withdraw' => '提现',
@@ -62,16 +62,16 @@ class WalletLog extends Common
'reward_income' => '服务收益-入账',
'reward_back' => '服务收益-退还',
'transfer_to_money' => '服务收益-转出到余额',
'push3' => '推荐开拓奖',
'push3' => '推荐提成',
'maker_diff' => '创客进阶奖',
'maker_peer' => '创客协同奖',
'maker_overtaken' => '创客卓越奖',
'team_venue' => '酒道馆运营奖',
'team_county' => '区县统筹奖',
'venue_peer' => '酒道馆协同奖',
'county_peer' => '区县协同奖',
'venue_share' => '酒道馆加权奖励',
'county_share' => '区县加权奖励'
'team_venue' => '酒道馆管理奖',
'team_county' => '区县管理奖',
'venue_peer' => '酒道馆平级奖',
'county_peer' => '区县代平级奖',
'venue_share' => '酒道馆加权奖',
'county_share' => '区县加权奖'
]
];
@@ -111,6 +111,6 @@ class WalletLog extends Common
$type = $data['type'] ?? '';
$event = $data['event'] ?? '';
$eventMap = $this->getEventMap();
return $eventMap[$type][$event] ?? ($eventMap['commission'][$event] ?? '');
return $eventMap[$type][$event] ?? ($eventMap['money'][$event] ?? ($eventMap['commission'][$event] ?? ($event ?: '')));
}
}