bztang
/
bztang-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：经销商无提成佣金时 平级奖照常发放

This commit is contained in:
wuhui_zzw 2023-12-07 18:45:34 +08:00
parent 1fe4a8dabe
commit 83a79b49af
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/team-dividend/src/admin/TeamAgencyController.php
View File

@ -330,19 +330,19 @@ class TeamAgencyController extends BaseController
// $set = \Setting::get('plugin.team_dividend');
// (new NewUpgrateJob($model->uid, $set, $model->uniacid, TeamDividendLevelUpgrade::ORDER_PAY, $model))->handle();
// $order = Order::find(3);
// $TeamReturnService = ReturnConfig::getClass();
// if (app('plugins')->isEnabled('team-sideways')) debug('经销商订单创建终止:team-sideways');
// $set = $order->getSetting('plugin.team_dividend');
// if (!$set['is_team_dividend']) debug('是否开启经销商插件');
// $buyMember = $order->belongsToMember;
// $agents = GetAgentsService::index($set, $order->uid, $order->create_time);
// foreach ($order->hasManyOrderGoods as $order_goods) {
// // 普通经销商提成处理
// $TeamReturnService->setData($order, $set, $buyMember, $order_goods, $agents);
// $TeamReturnService->handle();
// $this->totalDividend += $TeamReturnService->totalDividend;
// }
/* $order = Order::find(3);
$TeamReturnService = ReturnConfig::getClass();
if (app('plugins')->isEnabled('team-sideways')) debug('经销商订单创建终止:team-sideways');
$set = $order->getSetting('plugin.team_dividend');
if (!$set['is_team_dividend']) debug('是否开启经销商插件');
$buyMember = $order->belongsToMember;
$agents = GetAgentsService::index($set, $order->uid, $order->create_time);
foreach ($order->hasManyOrderGoods as $order_goods) {
// 普通经销商提成处理
$TeamReturnService->setData($order, $set, $buyMember, $order_goods, $agents);
$TeamReturnService->handle();
$this->totalDividend += $TeamReturnService->totalDividend;
}*/
debug("结束");
}

4
plugins/team-dividend/src/services/GetAmountService.php
View File

@ -199,11 +199,11 @@ class GetAmountService
if ($this->hasDividendRates()) {
$dividend_rates = $this->getDividendRates();
$ratio = $dividend_rates['level_' . ($this->dividendType == 1 ? $this->agent['cultural_level_id'] : $this->agent['level'])];
if (isset($ratio) && $ratio > 0) {
// if (isset($ratio) && $ratio > 0) {
// 提成结算金额
$amount = $this->order_goods->payment_amount;
return $amount;
}
// }
}
// 商城商品设置奖励固定金额

1
plugins/team-dividend/src/services/TeamReturnService.php
View File

@ -342,7 +342,6 @@ class TeamReturnService
'hierarchy' => $dividend_level['hierarchy'] + 1,
'dividend_amount' => $dividend_amount
];
// 是否开启平级奖下级获得经销商奖励计算方式
if ($this->set['calculate_formula'] == 1) {
$finishPrice = $this->obtainInfos[$this->dividendType == 1 ? $agent['cultural_level_id'] : $agent['level']];