修改：本人不在获得贡献值，只有直推上级可以获得

文字修改：贡献值分红名称改为贡献分享分红
文字修改：贡献值分红名称改为贡献分享分红，生态发展收益改为销售受益，贡献分红改为贡献分享分红，权证兑换改为合伙人受益，董事参与分股权改为合伙人参与分股权

app/common/models/Income.php

@@ -346,7 +346,7 @@ class Income extends BaseModel
                 else $query->where('yz_commission_order.level_type',0);
             })
             ->sum('yz_member_income.amount');
-        // 获取股东分红提成 收益类型：0=股权分红，1=加权收益 权证兑换
+        // 获取股东分红提成 收益类型：0=股权分红，1=加权收益 合伙人受益
         $shareholderDividendTotal = (float)Income::uniacid()
             ->leftjoin('yz_shareholder_dividend','yz_shareholder_dividend.id','=','yz_member_income.incometable_id')
             ->where('yz_member_income.dividend_code', 64)

app/common/services/income/IncomeService.php

@@ -203,11 +203,11 @@ class IncomeService
     const COMMISSION_PERFORMANCE_REDPACK = 186;//分销业绩奖励红包
     const COMMISSION_PERFORMANCE = 187;//分销业绩奖励
     const BALANCE_WITHDRAW_COMMISSION = 188; //余额手续费分红
-    const CONTRIBUTION_REWARD = 189;//贡献值分红
+    const CONTRIBUTION_REWARD = 189;//贡献分享分红
     const QUICKEN_INCOME_REWARD = 190;//加速收益分红
     const REWARD_POOL_DIVIDEND = 191;//奖金池分红
     const STORE_MANAGER = 200;// 经销商店长-店补
-    const CULTURAL_SPACE_CONTRIBUTION_BONUS = 201;// 文创空间 - 贡献值分红
+    const CULTURAL_SPACE_CONTRIBUTION_BONUS = 201;// 文创空间 - 贡献分享分红
 
     /**
      * @param $data 会员id：member_id，分红类型：dividend_code，分红表id：dividend_table_id，金额：amount，订单号：order_sn，详情：detail
@@ -678,7 +678,7 @@ class IncomeService
             self::QUICKEN_INCOME_REWARD             => defined('QUICKEN_INCOME_DIY_NAME') ? QUICKEN_INCOME_DIY_NAME : "加速收益分红",
             self::REWARD_POOL_DIVIDEND              => defined('REWARD_POOL_DIVIDEND_DIY_NAME') ? REWARD_POOL_DIVIDEND_DIY_NAME : "奖金池分红",
             self::STORE_MANAGER => '店补',
-            self::CULTURAL_SPACE_CONTRIBUTION_BONUS => '贡献值分红',
+            self::CULTURAL_SPACE_CONTRIBUTION_BONUS => '贡献分享分红',
         ];
         if (empty($income_config_desc[$code])) {
             if ($func = app('ShopAsset')->getData('income')[$code]) {

app/frontend/modules/finance/controllers/IncomeController.php

@@ -196,19 +196,19 @@ class IncomeController extends ApiController
         if($incomeModel){
             $incomeModel = $incomeModel->toArray();
             foreach($incomeModel['data'] as &$incomeItem){
-                if($incomeItem['commission_type'] == 1) $incomeItem['type_name'] = '生态发展';
+                if($incomeItem['commission_type'] == 1) $incomeItem['type_name'] = '销售受益';
                 else if($incomeItem['team_dividend_type'] == 4) $incomeItem['type_name'] = '生态建设';
                 else if($incomeItem['team_dividend_type'] == 5) $incomeItem['type_name'] = '生态贡献';
                 else if($incomeItem['team_dividend_type'] == 6) $incomeItem['type_name'] = '生态服务';
                 else if($incomeItem['dividend_code'] == 64 && $incomeItem['shareholder_dividend_type'] == 0) $incomeItem['type_name'] = '权重收益';//'股东分红';
-                else if($incomeItem['shareholder_dividend_type'] == 1) $incomeItem['type_name'] = '权证兑换';//'加权收益';
+                else if($incomeItem['shareholder_dividend_type'] == 1) $incomeItem['type_name'] = '合伙人受益';//'加权收益';
                 // switch($incomeItem['incometable_type']){
                 //     // 分销商相关处理
                 //     case 'Yunshop\Commission\models\CommissionOrder':
                 //         // 0=普通分销商订单，1=文创分销商订单
                 //
                 //         $commissionLevelType = CommissionOrder::where('id',$incomeItem['incometable_id'])->value('level_type');
-                //         if($commissionLevelType == 1) $incomeItem['type_name'] = '生态发展';
+                //         if($commissionLevelType == 1) $incomeItem['type_name'] = '销售受益';
                 //         break;
                 //     // 经销商相关处理
                 //     case 'Yunshop\TeamDividend\models\TeamDividendModel':

app/frontend/modules/finance/controllers/IncomeWithdrawController.php

@@ -554,7 +554,7 @@ class IncomeWithdrawController extends ApiController
                 ->get()->toArray();
         }
         else if($income['type'] == 'weight_income'){
-            // 股东分红 - 加权收益 权证兑换
+            // 股东分红 - 加权收益 合伙人受益
             $amountList = ShareholderDividendModel::getIncome((int)$uid,(int)1,'undrawn')
                 ->select(['yz_member_income.id','yz_member_income.amount'])
                 ->get()->toArray();
@@ -566,7 +566,7 @@ class IncomeWithdrawController extends ApiController
                 ->get()->toArray();
         }
         else if($income['type'] == 'commission_share_reward'){
-            // 分销商分红 - 生态发展
+            // 分销商分红 - 销售受益
             $amountList = CommissionOrder::getIncome((int)$uid,(int)1,'undrawn')
                 ->select(['yz_member_income.id','yz_member_income.amount'])
                 ->get()->toArray();

plugins/commission/src/PluginApplication.php

@@ -39,9 +39,9 @@ class PluginApplication extends \app\common\services\PluginApplication
                 'value' => 'withdraw',
             ],
             'commission_share_reward' => [
-                'title'     => '生态发展',
+                'title'     => '销售受益',
                 'type'      => 'commission_share_reward',
-                'type_name' => '生态发展',
+                'type_name' => '销售受益',
                 'class'     => 'Yunshop\Commission\models\CommissionOrder',
             ]
         ];

plugins/commission/views/admin/withdraw-set.blade.php

@@ -64,13 +64,13 @@
     {{--分享奖励提现设置--}}
     <div class="vue-main-title">
         <div class="vue-main-title-left"></div>
-        <div class="vue-main-title-content">生态发展奖励设置</div>
+        <div class="vue-main-title-content">销售受益奖励设置</div>
     </div>
     <div class="form-group">
         <label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
         <div class="col-sm-9 col-xs-12">
             <input type="text" name="withdraw[commission_share_reward][roll_out_limit]" class="form-control" value="{{$commissionShareReward['roll_out_limit']}}"/>
-            <span class="help-block">当前生态发展奖励达到此额度时才能提现</span>
+            <span class="help-block">当前销售受益奖励达到此额度时才能提现</span>
         </div>
     </div>
     <div class="form-group">

plugins/cultural-space/src/PluginApplication.php

@@ -125,7 +125,7 @@ class PluginApplication extends \app\common\services\PluginApplication{
     {
         return [
             'withdraw.contribution_bonus'  => [
-                'title' => '贡献值分红提现',
+                'title' => '贡献分享分红提现',
                 'class' => 'Yunshop\CulturalSpace\admin\widget\CulturalSpaceWithdrawWidget',
             ],
             'vue-goods.cultural_space' => [
@@ -147,9 +147,9 @@ class PluginApplication extends \app\common\services\PluginApplication{
     public function getIncomeItems(){
         return [
             'contributionBonus' => [
-                'title'     => '贡献值分红',
+                'title'     => '贡献分享分红',
                 'type'      => 'contributionBonus',
-                'type_name' => '贡献值分红',
+                'type_name' => '贡献分享分红',
                 'class'     => 'Yunshop\CulturalSpace\models\ContributionBonusLog',
             ]
         ];
@@ -163,15 +163,15 @@ class PluginApplication extends \app\common\services\PluginApplication{
 
     public function cronConfig(){
         \Event::listen('cron.collectJobs', function () {
-            // 每天0点30 执行一次贡献值分红处理
+            // 每天0点30 执行一次贡献分享分红处理
             \Cron::add('cultural-space-contribution-bonus', '30 0 * * *', function () {
-                \Log::debug('--- 文创空间 - 贡献值分红 - 开始 ----');
+                \Log::debug('--- 文创空间 - 贡献分享分红 - 开始 ----');
                 (new ContributionBonusLog())->bonusInit();
                 return;
             });
-            // 每天1点30 执行一次贡献值分红结算
+            // 每天1点30 执行一次贡献分享分红结算
             \Cron::add('cultural-space-contribution-bonus-settlement', '30 1 * * *', function () {
-                \Log::debug('--- 文创空间 - 贡献值分红 - 结算开始 ----');
+                \Log::debug('--- 文创空间 - 贡献分享分红 - 结算开始 ----');
                 (new ContributionBonusLog())->contributionBonusSettlement();
                 return;
             });

plugins/cultural-space/src/admin/ContributionController.php

@@ -25,8 +25,8 @@ class ContributionController extends BaseController{
             switch($tabsActive){
                 case 'show_detail':$result = ContributionLog::getList($search);break;// 贡献值变更明细
                 case 'show_group':$result = CulturalSpace::getList($search);break;// 贡献值用户持有统计
-                case 'show_bonus':$result = ContributionBonusLog::getList($search);break;// 贡献值分红明细
+                case 'show_bonus':$result = ContributionBonusLog::getList($search);break;// 贡献分享分红明细
-                case 'show_cycle':$result = ContributionBonus::getList();break;// 贡献值分红周期记录
+                case 'show_cycle':$result = ContributionBonus::getList();break;// 贡献分享分红周期记录
             }
 
             return $this->successJson('success',[

plugins/cultural-space/src/api/IndexController.php

@@ -85,7 +85,7 @@ class IndexController extends ApiController{
                     ->paginate(20)
                     ->toArray();
                 break;
-            // 贡献值分红明细
+            // 贡献分享分红明细
             case 'contribution_bonus':
                 $result = ContributionBonusLog::getIncomeSum($uid)
                     ->leftJoin('yz_cultural_space_contribution_bonus', function ($join) {
@@ -127,7 +127,7 @@ class IndexController extends ApiController{
             case 'team_performance':
                 $result = $this->getPerformanceChangeList($uid);
                 break;
-            // 加权收益明细 权证兑换
+            // 加权收益明细 合伙人受益
             case 'weight_income':
                 $result = ShareholderDividendModel::getIncome((int)$uid,(int)1)
                     ->select([
@@ -139,7 +139,7 @@ class IndexController extends ApiController{
                 break;
             // 股权收益明细
             case 'shareholding_income':$result = [];break;
-            // 生态发展明细
+            // 销售受益明细
             case 'share_reward':
                 $result = CommissionOrder::getIncome((int)$uid,(int)1)
                     ->select([
@@ -475,7 +475,7 @@ class IndexController extends ApiController{
         $info = [];
         // 获取相关统计信息
         switch($typeName){
-            // 生态发展收益
+            // 销售受益
             case 'ecological':
                 /*$amount = Income::uniacid()
                     ->select(['yz_member_income.id','yz_member_income.amount'])
@@ -502,12 +502,12 @@ class IndexController extends ApiController{
                     'service_income'      => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4)->sum('yz_member_income.amount'),// 生态建设
                     'contribution_income' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)5)->sum('yz_member_income.amount'),// 生态贡献
                     'commission' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)6)->sum('yz_member_income.amount'),// 生态服务
-                    'share_reward'        => CommissionOrder::getIncome((int)$uid,(int)1,'undrawn')->sum('yz_member_income.amount'),// 生态发展
+                    'share_reward'        => CommissionOrder::getIncome((int)$uid,(int)1,'undrawn')->sum('yz_member_income.amount'),// 销售受益
                     // 'commission'          => $poundage,// 总手续费
                     // 'withdrawal'          => $amount,// 总提现金额
                 ];
                 break;
-            // 贡献分红
+            // 贡献分享分红
             case 'contribution':
                 $poundage = Withdraw::uniacid()
                     ->where('type', 'Yunshop\CulturalSpace\models\ContributionBonusLog')
@@ -515,13 +515,13 @@ class IndexController extends ApiController{
                     ->sum('poundage');
 
                 $info = [
-                    'contribution_bonus'           => ContributionBonusLog::getIncomeSum($uid)->sum('yz_member_income.amount'),// 贡献值分红
+                    'contribution_bonus'           => ContributionBonusLog::getIncomeSum($uid)->sum('yz_member_income.amount'),// 贡献分享分红
                     'contribution_bonus_withdrawn' => ContributionBonusLog::getIncomeSum($uid,'withdrawn')->sum('yz_member_income.amount'),// 已提现
                     'contribution_bonus_undrawn'   => ContributionBonusLog::getIncomeSum($uid,'undrawn')->sum('yz_member_income.amount'),// 可提现
                     'poundage'                     => $poundage,// 总服务费
                 ];
                 break;
-            // 股权收益 权证兑换
+            // 股权收益 合伙人受益
             case 'shareholding':
 
                 $poundage = Income::uniacid()
@@ -537,7 +537,7 @@ class IndexController extends ApiController{
 
 
                 $info = [
-                    'weight_income'           => ShareholderDividendModel::getIncome((int)$uid,(int)1)->sum('yz_member_income.amount'),// 加权收益 权证兑换
+                    'weight_income'           => ShareholderDividendModel::getIncome((int)$uid,(int)1)->sum('yz_member_income.amount'),// 加权收益 合伙人受益
                     'weight_income_withdrawn' => ShareholderDividendModel::getIncome((int)$uid,(int)1,'withdrawn')->sum('yz_member_income.amount'),// 已提现
                     'weight_income_undrawn'   => ShareholderDividendModel::getIncome((int)$uid,(int)1,'undrawn')->sum('yz_member_income.amount'),// 可提现
                     'poundage'                => $poundage,// 总服务费
@@ -560,7 +560,7 @@ class IndexController extends ApiController{
         $result = [];
         // 获取相关统计信息
         switch($typeName){
-            // 生态发展收益
+            // 销售受益
             case 'ecological':
                 $result = Income::uniacid()
                     ->select(['yz_withdraw.amounts','yz_withdraw.id','yz_withdraw.created_at','yz_withdraw.actual_amounts','yz_withdraw.poundage','yz_withdraw.status'])
@@ -576,7 +576,7 @@ class IndexController extends ApiController{
                     ->paginate(20)
                     ->toArray();
                 break;
-            // 贡献分红
+            // 贡献分享分红
             case 'contribution':
                 $result = Withdraw::uniacid()
                     ->select(['id','amounts','created_at','actual_amounts','poundage','status'])

plugins/cultural-space/src/models/ContributionBonusLog.php

@@ -21,7 +21,7 @@ class ContributionBonusLog extends BaseModel{
     ];
     protected $fillable = ['uniacid','uid','total_money','money','total_contribution','hold_contribution','proportion','created_at'];
 
-    // 贡献值分红相关内容
+    // 贡献分享分红相关内容
     private $orderTotalMoney = 0;// 周期订单总金额
     private $bonusTotalMoney = 0;// 分红总销售额(周期订单总金额的N%)
 
@@ -53,7 +53,7 @@ class ContributionBonusLog extends BaseModel{
         return $list ? $list->toArray() : [];
     }
     /**
-     * Common: 获取用户贡献值分红
+     * Common: 获取用户贡献分享分红
      * Author: wu-hui
      * Time: 2023/11/20 16:06
      * @param int    $uid   用户id
@@ -75,7 +75,7 @@ class ContributionBonusLog extends BaseModel{
 
 
     /**
-     * Common: 贡献值分红 - 分红处理开始
+     * Common: 贡献分享分红 - 分红处理开始
      * Author: wu-hui
      * Time: 2023/11/03 15:09
      */
@@ -95,15 +95,15 @@ class ContributionBonusLog extends BaseModel{
                 if ($isRun) $this->bonusHandle($set,$startTime,$endTime);
             }
 
-            \Log::debug('--- 文创空间 - 贡献值分红 - 结束  end----');
+            \Log::debug('--- 文创空间 - 贡献分享分红 - 结束  end----');
             DB::commit();
         }catch(\Exception $e){
-            \Log::debug('--- 文创空间 - 贡献值分红 - 错误:'.$e->getMessage());
+            \Log::debug('--- 文创空间 - 贡献分享分红 - 错误:'.$e->getMessage());
             DB::rollBack();
         }
     }
     /**
-     * Common: 贡献值分红 - 判断是否允许继续执行
+     * Common: 贡献分享分红 - 判断是否允许继续执行
      * Author: wu-hui
      * Time: 2023/11/03 13:43
      * @param $set
@@ -150,7 +150,7 @@ class ContributionBonusLog extends BaseModel{
         return true;
     }
     /**
-     * Common: 贡献值分红 - 处理每个站点所有用户的分红
+     * Common: 贡献分享分红 - 处理每个站点所有用户的分红
      * Author: wu-hui
      * Time: 2023/11/03 15:09
      * @param $set
@@ -181,7 +181,7 @@ class ContributionBonusLog extends BaseModel{
         $time = time();
         $uniacid = \YunShop::app()->uniacid;
         foreach($userList as $userId => $contributionValue){
-            // 添加贡献值分红信息记录  这里必须进行100的偏移计算
+            // 添加贡献分享分红信息记录  这里必须进行100的偏移计算
             $radio = (float)sprintf("%.2f",$contributionValue / $totalContribution * 100);// 佣金比例
             $money = (float)sprintf("%.2f",$this->bonusTotalMoney * $radio / 100);// 实际获得佣金
             if($money > 0){
@@ -202,7 +202,7 @@ class ContributionBonusLog extends BaseModel{
         self::insert($logInsertData);
     }
     /**
-     * Common: 贡献值分红 - 结算
+     * Common: 贡献分享分红 - 结算
      * Author: wu-hui
      * Time: 2023/11/03 15:24
      */
@@ -244,7 +244,7 @@ class ContributionBonusLog extends BaseModel{
             }
             DB::commit();
         }catch(\Exception $e){
-            \Log::debug('--- 文创空间 - 贡献值分红结算 - 错误:'.$e->getMessage());
+            \Log::debug('--- 文创空间 - 贡献分享分红结算 - 错误:'.$e->getMessage());
             DB::rollBack();
         }
     }

plugins/cultural-space/src/models/CulturalSpace.php

@@ -79,16 +79,18 @@ class CulturalSpace extends BaseModel
         try {
             $set = Setting::get('plugin.cultural_space_set');
             if ($set['is_give_contribution'] != 1 || (float)$set['contribution_ratio'] <= 0) throw new \Exception('文创空间 - 购买商品奖励贡献值 - 未开启贡献值奖励或者奖励比例为0');
-            // 获取直推上级id  &&  获取订单商品信息
+            // 获取订单商品信息
-            $parentUid = (int)MemberParent::getParentId($uid);
             $orderGoodsList = (array)$this->getGoodsModel($orderId)
                 ->where('yz_goods_cultural_space.is_give_contribution', 1)
                 ->get()
                 ->makeHidden(['buttons', 'after_sales', 'order'])
                 ->toArray();
             if (count($orderGoodsList) <= 0) throw new \Exception('文创空间 - 购买商品奖励贡献值 - 无奖励商品信息');
-            // 获取文创空间用户信息
+            // 获取文创空间用户信息  todo：2023-12-15 修改，赠送上级，本人不在获得
-            $memberList = $parentUid <= 0 ? $this->getCulturalSpace([$uid]) : $this->getCulturalSpace([$uid, $parentUid]);
+            $parentUid = (int)MemberParent::getParentId($uid);// 获取直推上级id
+            if ($parentUid <= 0) throw new \Exception('文创空间 - 购买商品奖励贡献值 - 无上级信息');
+            $memberList = $this->getCulturalSpace([$parentUid]);
+            // $memberList = $parentUid <= 0 ? $this->getCulturalSpace([$uid]) : $this->getCulturalSpace([$uid, $parentUid]);
             $userName = Member::getMemberById($uid, ['realname', 'nickname'])->username ?? '';
             // 循环商品处理奖励贡献值
             $changeList = [];
@@ -330,7 +332,7 @@ class CulturalSpace extends BaseModel
 
         // 贡献收益(生态贡献)  经销商 生态贡献 奖励
         $contributionIncome = TeamDividendModel::getTypeTotalIncome((int)$uid,(int)5)->sum('yz_member_income.amount');
-        // 贡献值分红
+        // 贡献分享分红
         $contributionBonus = ContributionBonusLog::getIncomeSum($uid)->sum('yz_member_income.amount');
         // 获取文创空间用户信息
         $culturalSpace = CulturalSpace::uniacid()->where('uid',$uid)->select(['uid','contribution','voucher_number'])->first();
@@ -341,7 +343,7 @@ class CulturalSpace extends BaseModel
         $legumesIncome = sprintf("%.2f",$culturalSpace['voucher_number'] * $exchangeRate);
         // 获取小区业绩(去除最大的线的业绩)和团队总业绩
         $teamAmount = $this->getTeamOrderAmount($uid);
-        // 获取加权收益  权证兑换
+        // 获取加权收益  合伙人受益
         $weightIncome = ShareholderDividendModel::getIncome((int)$uid,(int)1)->sum('yz_member_income.amount');
         // 分享奖励
         $shareReward = CommissionOrder::getIncome((int)$uid,(int)1,'undrawn')->sum('yz_member_income.amount');
@@ -350,17 +352,17 @@ class CulturalSpace extends BaseModel
         $list = [
             'service_income'      => ['key_name' => 'service_income','title' => $serviceIncomeTitle ?? '服务收益','num' => $serviceIncome,'sort' => 0],
             'contribution_income' => ['key_name' => 'contribution_income','title' => '生态贡献','num' => $contributionIncome,'sort' => 1],
-            'contribution_bonus'  => ['key_name' => 'contribution_bonus','title' => '贡献值分红','num' => $contributionBonus,'sort' => 2],
+            'contribution_bonus'  => ['key_name' => 'contribution_bonus','title' => '贡献分享分红','num' => $contributionBonus,'sort' => 2],
             'legumes'             => ['key_name' => 'legumes','title' => '文创豆','num' => $culturalSpace['voucher_number'],'sort' => 3],
             'legumes_income'      => ['key_name' => 'legumes_income','title' => '文创豆收益','num' => $legumesIncome,'sort' => 4],
             'contribution_value'  => ['key_name' => 'contribution_value','title' => '贡献值','num' => $culturalSpace['contribution'],'sort' => 5],
             'area_performance'    => ['key_name' => 'area_performance','title' => '小区业绩','num' => $teamAmount['area_amount'],'sort' => 7],
             'team_performance'    => ['key_name' => 'team_performance','title' => '团队总业绩','num' => $teamAmount['team_amount'],'sort' => 8],
-            'weight_income'       => ['key_name' => 'weight_income','title' => '权证兑换','num' => $weightIncome,'sort' => 9],
+            'weight_income'       => ['key_name' => 'weight_income','title' => '合伙人受益','num' => $weightIncome,'sort' => 9],
             'shareholding_income' => ['key_name' => 'shareholding_income','title' => '股权收益','num' => 0,'sort' => 10],
-            'share_reward'        => ['key_name' => 'share_reward','title' => '生态发展','num' => $shareReward,'sort' => 11],
+            'share_reward'        => ['key_name' => 'share_reward','title' => '销售受益','num' => $shareReward,'sort' => 11],
         ];
-        // 合伙人等级增加显示权证兑换，不显示服务收益、贡献收益、贡献值分红
+        // 合伙人等级增加显示合伙人受益，不显示服务收益、贡献收益、贡献分享分红
         // if($isPartner) unset($list['service_income'],$list['contribution_income'],$list['contribution_bonus']);
         // else unset($list['weight_income']);
         // 排序

plugins/cultural-space/views/index/set.blade.php

@@ -70,7 +70,7 @@
                                     <div class="form-item_tips">订单实际支付的N%奖励给用户及直推上级，作为贡献值。0或者空则无贡献值奖励</div>
                                 </el-form-item>
                                 <el-form-item label="分红总额比例" prop="contribution_bonus_ratio">
-                                    <el-input type="number" placeholder="贡献值分红总额比例" v-model.number="set.contribution_bonus_ratio" step="0.01">
+                                    <el-input type="number" placeholder="贡献分享分红总额比例" v-model.number="set.contribution_bonus_ratio" step="0.01">
                                         <template slot="append">%</template>
                                     </el-input>
                                     <div class="form-item_tips">周期销售额的N%用作分红总金额，根据每个人当前贡献值比例进行分红；0或者空则无贡献值奖励</div>

plugins/shareholder-dividend/src/PluginApplication.php

@@ -32,9 +32,9 @@ class PluginApplication extends \app\common\services\PluginApplication
                 'class'     => 'Yunshop\ShareholderDividend\models\ShareholderDividendModel',
             ],
            'weight_income' => [
-                'title'     => '权证兑换',// 加权收益
+                'title'     => '合伙人受益',// 加权收益
                 'type'      => 'weight_income',
-                'type_name' => '权证兑换',
+                'type_name' => '合伙人受益',
                 'class'     => 'Yunshop\ShareholderDividend\models\ShareholderDividendModel',
             ]
 

plugins/shareholder-dividend/src/models/ShareholderDividendModel.php

@@ -54,7 +54,7 @@ class ShareholderDividendModel extends BackendModel
      * Author: wu-hui
      * Time: 2023/11/22 10:06
      * @param int    $uid   用户id
-     * @param int    $incomeType    收益类型：0=股权分红，1=加权收益(权证兑换)
+     * @param int    $incomeType    收益类型：0=股权分红，1=加权收益(合伙人受益)
      * @param string $incomeStatus   all=全部收益；undrawn=未提现收益，withdrawn=已提现收益
      * @return mixed
      */

plugins/shareholder-dividend/src/services/TimedTaskService.php

@@ -351,7 +351,7 @@ class TimedTaskService
         foreach ($teamLevels as $teamLevel) {
             // 判断：结算方式是否符合条件
             $levelSettlementType = (int)$this->set['level_settlement_type']['level_' . $teamLevel['id']];// 结算方式 0=周期，1=订单支付后
-            $incomeType = (int)$this->set['income_type']['level_' . $teamLevel['id']];// 收益类型 0=股东分红，1=加权收益(权证兑换)
+            $incomeType = (int)$this->set['income_type']['level_' . $teamLevel['id']];// 收益类型 0=股东分红，1=加权收益(合伙人受益)
             $rate = (float)$this->set['level_rate']['level_' . $teamLevel['id']]; // 等级分红比例
             if ($rate > 0 && (($settlementType == 'cycle' && $levelSettlementType == 0) || ($settlementType == 'order' && $levelSettlementType == 1))) {
                 $levelBonusType = (float)$this->set['level_bonus_type']['level_' . $teamLevel['id']]; // 分红方式：0=按权重值比例，1=平均分

plugins/shareholder-dividend/views/admin/tpl/aingle-dividend.blade.php

@@ -174,7 +174,7 @@
                                     <input type="radio" name="setdata[income_type][level_{{$lelve->id}}]" value="0" @if ((int)$set['income_type']['level_'.$lelve->id] != 1) checked @endif> 股东分红
                                 </label>
                                 <label class="radio-inline">
-                                    <input type="radio" name="setdata[income_type][level_{{$lelve->id}}]" value="1" @if ((int)$set['income_type']['level_'.$lelve->id] == 1) checked @endif> {{--加权收益--}}权证兑换
+                                    <input type="radio" name="setdata[income_type][level_{{$lelve->id}}]" value="1" @if ((int)$set['income_type']['level_'.$lelve->id] == 1) checked @endif> {{--加权收益--}}合伙人受益
                                 </label>
                             </div>
                         </div>

plugins/shareholder-dividend/views/admin/withdraw-set.blade.php

@@ -49,10 +49,10 @@
             </div>
         </div>
     </div>
-    {{--权证兑换提现设置--}}
+    {{--合伙人受益提现设置--}}
     <div class="vue-main-title">
         <div class="vue-main-title-left"></div>
-        <div class="vue-main-title-content">权证兑换提现设置</div>
+        <div class="vue-main-title-content">合伙人受益提现设置</div>
     </div>
     <div class="form-group">
         <label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>

plugins/weight-value/src/models/WeightValue.php

@@ -588,7 +588,7 @@ class WeightValue extends BaseModel{
     public function getStatistics($uid,$teamLevelId){
         // 获取相关统计信息
         [$directPush,$recommendAgent] = $this->getCommissionGive($uid);
-        // 获取权重收益(当前等级相关的股东分红)  收益类型：0=股权分红，1=加权收益(权证兑换)
+        // 获取权重收益(当前等级相关的股东分红)  收益类型：0=股权分红，1=加权收益(合伙人受益)
         $weightIncome = ShareholderDividendModel::uniacid()
             ->where('member_id',$uid)
             ->where('team_level',$teamLevelId)