feat(partner): 调整酒道馆与区县代理日结均分池为1分钟增量结算
这个提交包含在:
@@ -42,7 +42,19 @@ class WalletLog extends Common
|
||||
'recharge_gift' => '线上充值-赠送余额',
|
||||
'activity_gift' => '活动-赠送余额',
|
||||
'order_refund' => '订单退款-退还余额',
|
||||
'transfer_by_commission' => '服务收益-转入到余额'
|
||||
'transfer_by_commission' => '服务收益-转入到余额',
|
||||
'reward_income' => '收益分成-入账',
|
||||
'reward_back' => '收益分成-退还',
|
||||
'push3' => '推荐开拓奖',
|
||||
'maker_diff' => '创客进阶奖',
|
||||
'maker_peer' => '创客协同奖',
|
||||
'maker_overtaken' => '创客卓越奖',
|
||||
'team_venue' => '酒道馆运营奖',
|
||||
'team_county' => '区县统筹奖',
|
||||
'venue_peer' => '酒道馆协同奖',
|
||||
'county_peer' => '区县协同奖',
|
||||
'venue_share' => '酒道馆加权奖励',
|
||||
'county_share' => '区县加权奖励'
|
||||
],
|
||||
'commission' => [
|
||||
'withdraw' => '提现',
|
||||
@@ -64,7 +76,19 @@ class WalletLog extends Common
|
||||
];
|
||||
|
||||
public function getEventMap() {
|
||||
return $this->eventMap;
|
||||
$map = $this->eventMap;
|
||||
if (class_exists('\\addons\\shopro\\service\\partner\\PartnerConfig')) {
|
||||
$partnerMap = \addons\shopro\service\partner\PartnerConfig::rewardTypeMap();
|
||||
foreach ($partnerMap as $k => $v) {
|
||||
if (!isset($map['money'][$k])) {
|
||||
$map['money'][$k] = $v;
|
||||
}
|
||||
if (!isset($map['commission'][$k])) {
|
||||
$map['commission'][$k] = $v;
|
||||
}
|
||||
}
|
||||
}
|
||||
return $map;
|
||||
}
|
||||
|
||||
public function scopeMoney($query)
|
||||
@@ -84,6 +108,9 @@ class WalletLog extends Common
|
||||
|
||||
public function getEventTextAttr($value, $data)
|
||||
{
|
||||
return $this->eventMap[$data['type']][$data['event']] ?? '';
|
||||
$type = $data['type'] ?? '';
|
||||
$event = $data['event'] ?? '';
|
||||
$eventMap = $this->getEventMap();
|
||||
return $eventMap[$type][$event] ?? ($eventMap['commission'][$event] ?? '');
|
||||
}
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户