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-08 18:18:51 +08:00
parent 5f5ed953ce
commit d45597e240
2 changed files with 17 additions and 15 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(22);
// $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("结束");
}

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

@ -541,8 +541,10 @@ class TeamReturnService
'created_at' => time(),
];
// 判断：如果当前是 文创生态建设 修改对应的类型值
if($this->dividendType == 1 && $dividendData['type'] < 6) $dividendData['type'] = $dividendData['type'] == 1 ? 5 : 4;
if($this->dividendType == 1 && $dividendData['type'] < 6) {
if($dividendData['type'] == 1) $dividendData['type'] = 5;
else if($dividendData['type'] == 0) $dividendData['type'] = 4;
}
//取小数点后两位数四舍五入 例如设置独立金额0.003元
if (round($dividendData['dividend_amount'], 2) <= 0) return;
if (empty($dividendData['lower_level_rate'])) $dividendData['lower_level_rate'] = 0;