From 5f5ed953ce262986c86af76b8b3fdfcb8407e76b Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Fri, 8 Dec 2023 17:56:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=96=87=E5=AD=97=E5=86=85=E5=AE=B9=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=82=A1=E4=B8=9C=E5=88=86=E7=BA=A2?= =?UTF-8?q?=E5=95=86=E5=9F=8E=E9=94=80=E5=94=AE=E6=80=BB=E9=A2=9D=E4=B8=BA?= =?UTF-8?q?0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/services/income/IncomeService.php | 4 ++-- plugins/commission/src/PluginApplication.php | 2 +- plugins/commission/views/widget/profit/distribution.js | 2 +- .../src/services/CycleAmounyService.php | 4 ++-- .../src/services/TimedTaskService.php | 9 +++++---- plugins/team-dividend/src/PluginApplication.php | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/common/services/income/IncomeService.php b/app/common/services/income/IncomeService.php index 0cfc6301..23c5956f 100644 --- a/app/common/services/income/IncomeService.php +++ b/app/common/services/income/IncomeService.php @@ -490,8 +490,8 @@ class IncomeService private static function getDividendCodeName($code) { $income_config_desc = [ - self::COMMISSION_ORDER => \Setting::get('shop.lang.zh_cn.commission.commission_amount') ? : '分销佣金', - self::TEAM_DIVIDEND => '经销商分红', + self::COMMISSION_ORDER => \Setting::get('shop.lang.zh_cn.commission.commission_amount') ? : '直推奖励', + self::TEAM_DIVIDEND => '团队收益', self::AGENT_DIVIDEND => '代理商分红', self::APPOINTMENT_ORDER => '门店预约', self::AREA_DIVIDEND => '区域分红', diff --git a/plugins/commission/src/PluginApplication.php b/plugins/commission/src/PluginApplication.php index 969cf54d..e8385929 100644 --- a/plugins/commission/src/PluginApplication.php +++ b/plugins/commission/src/PluginApplication.php @@ -32,7 +32,7 @@ class PluginApplication extends \app\common\services\PluginApplication public function getIncomeItems(){ return [ 'commission' => [ - 'title' => \Setting::get('shop.lang.zh_cn.commission.commission_amount') ?: trans('Yunshop\Commission::index.commission'), + 'title' => '直推奖励',//\Setting::get('shop.lang.zh_cn.commission.commission_amount') ?: trans('Yunshop\Commission::index.commission'), 'type' => 'commission', 'class' => 'Yunshop\Commission\models\CommissionOrder', 'name' => 'updatedWithdraw', diff --git a/plugins/commission/views/widget/profit/distribution.js b/plugins/commission/views/widget/profit/distribution.js index 4b07a0ca..db4f6823 100644 --- a/plugins/commission/views/widget/profit/distribution.js +++ b/plugins/commission/views/widget/profit/distribution.js @@ -14,7 +14,7 @@ define({ 关闭 开启 -
如果不开启分销，则不产生分销佣金
+
如果不开启分销，则不产生直推奖励
 diff --git a/plugins/shareholder-dividend/src/services/CycleAmounyService.php b/plugins/shareholder-dividend/src/services/CycleAmounyService.php index 9282caff..7651bd87 100644 --- a/plugins/shareholder-dividend/src/services/CycleAmounyService.php +++ b/plugins/shareholder-dividend/src/services/CycleAmounyService.php @@ -271,7 +271,7 @@ class CycleAmounyService * @param $method * @param $rate * @param $levelId - * @return float|int + * @return array */ private static function computeLvCountOrderAmount($orderGoodsList, $method, $rate, $levelId){ $TotalMoney = 0; @@ -296,7 +296,7 @@ class CycleAmounyService } } - return $TotalMoney; + return [$TotalMoney,array_sum(array_column($orderGoodsList,'payment_amount'))]; } diff --git a/plugins/shareholder-dividend/src/services/TimedTaskService.php b/plugins/shareholder-dividend/src/services/TimedTaskService.php index 8a2e5acd..4b5657c4 100644 --- a/plugins/shareholder-dividend/src/services/TimedTaskService.php +++ b/plugins/shareholder-dividend/src/services/TimedTaskService.php @@ -62,7 +62,7 @@ class TimedTaskService Setting::$uniqueAccountId = \YunShop::app()->uniacid = $u->uniacid; $this->set = Setting::get('plugin.shareholder'); $this->setLog = Setting::get('plugin.shareholder_log'); - $is_execute = true;//$this->isExecute(); + $is_execute = $this->isExecute(); if ($is_execute) { \Log::info('========股东分红UNIACID:' . $u->uniacid . '执行========'); $this->setLog['current_d'] = date('d'); @@ -306,6 +306,8 @@ class TimedTaskService break; } + // [$this->startTime,$this->endTime] = getTimeStamp('today'); + // $orderAmount = CycleAmounyService::getCycleAmount($this->set['culate_cycle'], $this->set['culate_method']); // 上一个周期金额 // if ($orderAmount <= 0) { // \Log::info('========shareholderDividend():没有返现总金额'); @@ -380,14 +382,13 @@ class TimedTaskService $lvCountOrderAmount = 0; if($settlementType == 'order'){ // 根据订单查询 - $lvCountOrderAmount = (float)CycleAmounyService::getOrderAmountNew($orderId, $this->set['culate_method'],$rate,$teamLevel['id']); + [$lvCountOrderAmount,$orderAmount] = CycleAmounyService::getOrderAmountNew($orderId, $this->set['culate_method'],$rate,$teamLevel['id']); }else{ // 根据周期查询 - $lvCountOrderAmount = (float)CycleAmounyService::getCycleAmountNew($this->startTime,$this->endTime, $this->set['culate_method'],$rate,$teamLevel['id']); + [$lvCountOrderAmount,$orderAmount] = CycleAmounyService::getCycleAmountNew($this->startTime,$this->endTime, $this->set['culate_method'],$rate,$teamLevel['id']); } // 共分红金额 为0 跳出循环 if($lvCountOrderAmount <= 0) continue; - // $lvCountOrderAmount = sprintf("%.2f", $orderAmount / 100 * $rate); // 获取当前等级的全部权重值 foreach ($teamAgentsList as $item) { diff --git a/plugins/team-dividend/src/PluginApplication.php b/plugins/team-dividend/src/PluginApplication.php index 1827724c..60f9b9dc 100644 --- a/plugins/team-dividend/src/PluginApplication.php +++ b/plugins/team-dividend/src/PluginApplication.php @@ -648,9 +648,9 @@ class PluginApplication extends \app\common\services\PluginApplication // } return [ 'teamDividend' => [ - 'title' => $lang['title'] ?: trans('Yunshop\TeamDividend::index.title'), + 'title' => '团队收益',//$lang['title'] ?: trans('Yunshop\TeamDividend::index.title'), 'type' => 'teamDividend', - 'type_name' => $title.$dividend, + 'type_name' => '团队收益',//$title.$dividend, 'class' => 'Yunshop\TeamDividend\models\TeamDividendModel', ], // 'storeManager' => [