diff --git a/app/common/models/Income.php b/app/common/models/Income.php index 5eec83c0..2e4e2394 100644 --- a/app/common/models/Income.php +++ b/app/common/models/Income.php @@ -326,7 +326,7 @@ class Income extends BaseModel ->whereNotIn('dividend_code',[1,2,64,201]) ->where('member_id', $uid) ->sum('amount'); - // 获取经销商提成 分红类型：0=分红佣金，1=平级奖，2=感恩奖励，3=额外分红，4=服务受益，5=生态贡献(服务受益平级奖)，6=经销商受益 + // 获取经销商提成 分红类型：0=分红佣金，1=平级奖，2=感恩奖励，3=额外分红，4=生态建设，5=生态贡献(生态建设平级奖)，6=生态服务 $teamDividendTotal = (float)Income::uniacid() ->leftjoin('yz_team_dividend','yz_team_dividend.id','=','yz_member_income.incometable_id') ->where('yz_member_income.dividend_code', 2) diff --git a/app/frontend/modules/finance/controllers/IncomeController.php b/app/frontend/modules/finance/controllers/IncomeController.php index f23fb889..2adf5673 100644 --- a/app/frontend/modules/finance/controllers/IncomeController.php +++ b/app/frontend/modules/finance/controllers/IncomeController.php @@ -201,9 +201,9 @@ class IncomeController extends ApiController if($incomeItem['commission_hierarchy'] == 1)$incomeItem['type_name'] = '销售受益'; if($incomeItem['commission_hierarchy'] == 2)$incomeItem['type_name'] = '服务受益'; } - else if($incomeItem['team_dividend_type'] == 4) $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['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'] = '合伙人受益';//'加权收益'; // switch($incomeItem['incometable_type']){ @@ -216,11 +216,11 @@ class IncomeController extends ApiController // break; // // 经销商相关处理 // case 'Yunshop\TeamDividend\models\TeamDividendModel': - // // 分红类型：0=分红佣金，1=平级奖，2=感恩奖励，3=额外分红，4=服务受益，5=生态贡献(服务受益平级奖)，6=经销商受益 + // // 分红类型：0=分红佣金，1=平级奖，2=感恩奖励，3=额外分红，4=生态建设，5=生态贡献(生态建设平级奖)，6=生态服务 // $teamDividendType = TeamDividendModel::where('id',$incomeItem['incometable_id'])->value('type'); // if($teamDividendType == 4) $incomeItem['type_name'] = '服务受益'; // else if($teamDividendType == 5) $incomeItem['type_name'] = '生态贡献'; - // else if($teamDividendType == 6) $incomeItem['type_name'] = '经销商受益'; + // else if($teamDividendType == 6) $incomeItem['type_name'] = '生态服务'; // break; // // 股东分红相关处理 // case 'Yunshop\ShareholderDividend\models\ShareholderDividendModel': diff --git a/app/frontend/modules/finance/controllers/IncomeWithdrawController.php b/app/frontend/modules/finance/controllers/IncomeWithdrawController.php index d2dc8123..9f27f27b 100644 --- a/app/frontend/modules/finance/controllers/IncomeWithdrawController.php +++ b/app/frontend/modules/finance/controllers/IncomeWithdrawController.php @@ -513,45 +513,28 @@ class IncomeWithdrawController extends ApiController ->get()->toArray(); } else if($income['type'] == 'ecological_services'){ - // 经销商受益 - // $amountList = Income::uniacid() - // ->select(['yz_member_income.id','yz_member_income.amount']) - // ->leftJoin('yz_team_dividend','yz_team_dividend.id','yz_member_income.incometable_id') - // ->where('yz_member_income.incometable_type', $income['class']) - // ->where('yz_member_income.status', Income::STATUS_INITIAL) - // ->where('yz_member_income.member_id', $uid) - // ->where('yz_team_dividend.type',6) - // ->get()->toArray(); - + // 生态服务 $amountList = Income::uniacid() ->select(['yz_member_income.id','yz_member_income.amount']) ->leftJoin('yz_team_dividend','yz_team_dividend.id','yz_member_income.incometable_id') ->where('yz_member_income.incometable_type', $income['class']) ->where('yz_member_income.status', Income::STATUS_INITIAL) ->where('yz_member_income.member_id', $uid) - ->where('yz_team_dividend.type', 4) + ->where('yz_team_dividend.type',6) ->get()->toArray(); - } else if($income['type'] == 'ecological_construction'){ - // 服务受益 - $startTime = strtotime(date("Y-m-1"));// 本月1号0点 - // $amountList = Income::uniacid() - // ->select(['yz_member_income.id','yz_member_income.amount']) - // ->leftJoin('yz_team_dividend','yz_team_dividend.id','yz_member_income.incometable_id') - // ->where('yz_member_income.incometable_type', $income['class']) - // ->where('yz_member_income.status', Income::STATUS_INITIAL) - // ->where('yz_member_income.member_id', $uid) - // ->where('yz_member_income.created_at', '<',$startTime) - // ->where('yz_team_dividend.type', 4) - // ->get()->toArray(); - - // 分销商分红 - 服务受益( todo 修改：2023-12-15 提取分销商间推奖) - $amountList = CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',2) + // 生态建设 经销商受益 + // $startTime = strtotime(date("Y-m-1"));// 本月1号0点 + $amountList = Income::uniacid() ->select(['yz_member_income.id','yz_member_income.amount']) - ->where('yz_member_income.created_at', '<',$startTime) - ->get() - ->toArray(); + ->leftJoin('yz_team_dividend','yz_team_dividend.id','yz_member_income.incometable_id') + ->where('yz_member_income.incometable_type', $income['class']) + ->where('yz_member_income.status', Income::STATUS_INITIAL) + ->where('yz_member_income.member_id', $uid) + // ->where('yz_member_income.created_at', '<',$startTime) + ->where('yz_team_dividend.type', 4) + ->get()->toArray(); } else if($income['type'] == 'ecological_contribution'){ // 生态贡献 @@ -588,6 +571,14 @@ class IncomeWithdrawController extends ApiController ->select(['yz_member_income.id','yz_member_income.amount']) ->get()->toArray(); } + else if($income['type'] == 'commission_service_reward'){ + // 分销商分红 - 服务受益( todo 修改：2023-12-15 提取分销商间推奖) + $amountList = CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',2) + ->select(['yz_member_income.id','yz_member_income.amount']) + // ->where('yz_member_income.created_at', '<',$startTime) + ->get() + ->toArray(); + } else{ $amountList = $this->getIncomeModel()->select(['id','amount'])->where('incometable_type', $income['class'])->get()->toArray(); } diff --git a/plugins/commission/src/PluginApplication.php b/plugins/commission/src/PluginApplication.php index 3b3516a3..0159e18a 100644 --- a/plugins/commission/src/PluginApplication.php +++ b/plugins/commission/src/PluginApplication.php @@ -44,9 +44,9 @@ class PluginApplication extends \app\common\services\PluginApplication 'type_name' => '销售受益', 'class' => 'Yunshop\Commission\models\CommissionOrder', ], - 'ecological_construction' => [ + 'commission_service_reward' => [ 'title' => '服务受益', - 'type' => 'ecological_construction', + 'type' => 'commission_service_reward', 'type_name' => '服务受益', 'class' => 'Yunshop\Commission\models\CommissionOrder', ] diff --git a/plugins/cultural-space/src/admin/IndexController.php b/plugins/cultural-space/src/admin/IndexController.php index 476aeaba..6960e178 100644 --- a/plugins/cultural-space/src/admin/IndexController.php +++ b/plugins/cultural-space/src/admin/IndexController.php @@ -3,7 +3,9 @@ namespace Yunshop\CulturalSpace\admin; use app\common\components\BaseController; use app\common\facades\Setting; +use app\common\models\Order; use Yunshop\CulturalSpace\models\ContributionBonusLog; +use Yunshop\CulturalSpace\models\CulturalSpace; use Yunshop\NewPoster\models\Poster; class IndexController extends BaseController{ @@ -40,6 +42,11 @@ class IndexController extends BaseController{ public function test(){ // (new CulturalSpace())->buyGoodsGiveContribution(19,76);// 订单支付成功奖励贡献值 + + // $model = Order::find(21); + // (new CulturalSpace())->GiveGoodsFundMoney($model->uid,$model->id);// 订单支付成功 基金池处理 + + // (new ContributionBonusLog())->bonusInit(); // (new ContributionBonusLog())->contributionBonusSettlement(); diff --git a/plugins/cultural-space/src/api/IndexController.php b/plugins/cultural-space/src/api/IndexController.php index 09915695..fd11b88e 100644 --- a/plugins/cultural-space/src/api/IndexController.php +++ b/plugins/cultural-space/src/api/IndexController.php @@ -158,7 +158,7 @@ class IndexController extends ApiController{ ->paginate(20) ->toArray(); break; - // 经销商受益 + // 生态服务 case 'ecological_services': // $result = TeamDividendModel::getTypeTotalIncome((int)$uid,(int)6) // ->select(['yz_team_dividend.agent_level','yz_team_dividend.order_sn','yz_team_dividend.status','yz_team_dividend.type','yz_team_dividend.created_at','yz_member_income.amount']) diff --git a/plugins/cultural-space/src/models/CulturalSpace.php b/plugins/cultural-space/src/models/CulturalSpace.php index 583524fe..dd20a324 100644 --- a/plugins/cultural-space/src/models/CulturalSpace.php +++ b/plugins/cultural-space/src/models/CulturalSpace.php @@ -160,7 +160,7 @@ class CulturalSpace extends BaseModel ->get() ->makeHidden(['buttons', 'after_sales', 'order']) ->toArray(); - if (count($orderGoodsList) <= 0) throw new \Exception('文创空间 - 购买商品奖励贡献值 - 无奖励商品信息'); + if (count($orderGoodsList) <= 0) throw new \Exception('文创空间 - 基金池操作 - 无奖励商品信息'); $current_fee = $set['fund_start_price']; //当前价格 $last_fee = $current_fee; $fund_money = 0; @@ -199,9 +199,18 @@ class CulturalSpace extends BaseModel ]; CulturalOrderFundLog::InsertLog($data_log); //写入日记 } - if($user_voucher_number > 0){ - $this->where('uid', $uid)->increment('voucher_number', $user_voucher_total);//用户增量 + $isHas = (int)$this->where('uid', $uid)->value('id');//用户增量 + if($isHas <= 0){ + self::insert([ + 'uniacid' => \YunShop::app()->uniacid, + 'uid' => $uid, + 'voucher_number' => $user_voucher_total, + ]); + }else{ + $this->where('uid', $uid)->increment('voucher_number', $user_voucher_total);//用户增量 + } + $next_fee = round($fund_money / $voucher_number, 2); $FundData = [ 'last_fee' => $last_fee, @@ -221,10 +230,13 @@ class CulturalSpace extends BaseModel // 获取文创空间用户信息 // 数据操作 DB::commit(); - } else { - DB::rollBack(); + } + else { + throw new \Exception('文创空间 - 基金池操作 - 未开启基金池'); } } catch (\Exception $e) { + + \Log::debug('文创空间 - 基金池操作 - 错误：'.$e->getMessage()); DB::rollBack(); } } @@ -324,11 +336,11 @@ class CulturalSpace extends BaseModel * @return array[] */ public function getStatistics($uid){ - // 服务收益(经销商受益) 经销商 服务受益 奖励 + // 服务收益 经销商 生态建设 奖励 [经销商受益] $serviceIncome = TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4)->sum('yz_member_income.amount'); // 获取用户当前经销商等级对应的文创补贴名称 // $teamDividendLevel = TeamDividendAgencyModel::where('uid',$uid)->value('cultural_level_id'); - $serviceIncomeTitle = '经销商受益';//TeamDividendLevelModel::uniacid()->where('id',$teamDividendLevel)->value('cultural_level_name'); + $serviceIncomeTitle = '生态服务';//TeamDividendLevelModel::uniacid()->where('id',$teamDividendLevel)->value('cultural_level_name'); // 贡献收益(生态贡献) 经销商 生态贡献 奖励 $contributionIncome = TeamDividendModel::getTypeTotalIncome((int)$uid,(int)5)->sum('yz_member_income.amount'); diff --git a/plugins/team-dividend/src/PluginApplication.php b/plugins/team-dividend/src/PluginApplication.php index 9b11f183..d4269c77 100644 --- a/plugins/team-dividend/src/PluginApplication.php +++ b/plugins/team-dividend/src/PluginApplication.php @@ -639,12 +639,12 @@ class PluginApplication extends \app\common\services\PluginApplication $lang = \Setting::get('shop.lang', ['lang' => 'zh_cn'])['zh_cn']['team_dividend']; $title = $lang['title'] ?: trans('Yunshop\TeamDividend::index.name'); $dividend = $lang['dividend'] ?: trans('Yunshop\TeamDividend::index.dividend'); - // $teamDividendCulturalName = '服务受益'; + // $teamDividendCulturalName = '生态建设'; // $uid = \YunShop::app()->getMemberId(); // if($uid > 0){ // $culturalLevelId = TeamDividendAgencyModel::uniacid()->where('uid',$uid)->value('cultural_level_id'); // $teamDividendCulturalName = TeamDividendLevelModel::uniacid()->where('id',$culturalLevelId)->value('cultural_level_name'); - // $teamDividendCulturalName = !empty($teamDividendCulturalName) ? $teamDividendCulturalName : '服务受益'; + // $teamDividendCulturalName = !empty($teamDividendCulturalName) ? $teamDividendCulturalName : '生态建设'; // } return [ 'teamDividend' => [ @@ -667,15 +667,15 @@ class PluginApplication extends \app\common\services\PluginApplication // ], 'ecological_services' => [ - 'title' => '经销商受益', + 'title' => '生态服务', 'type' => 'ecological_services', - 'type_name' => '经销商受益', + 'type_name' => '生态服务', 'class' => 'Yunshop\TeamDividend\models\TeamDividendModel', ], 'ecological_construction' => [ - 'title' => '服务受益', + 'title' => '经销商受益',//'生态建设', 'type' => 'ecological_construction', - 'type_name' => '服务受益', + 'type_name' => '经销商受益',//'生态建设', 'class' => 'Yunshop\TeamDividend\models\TeamDividendModel', ], 'ecological_contribution' => [ diff --git a/plugins/team-dividend/src/admin/TeamAgencyController.php b/plugins/team-dividend/src/admin/TeamAgencyController.php index a6ae874c..de1fea0b 100644 --- a/plugins/team-dividend/src/admin/TeamAgencyController.php +++ b/plugins/team-dividend/src/admin/TeamAgencyController.php @@ -325,14 +325,14 @@ class TeamAgencyController extends BaseController public function test(){ - //经销商升级模拟 因为model偶尔会出现status异常的问题，所以重新查询一遍 - // $model = Order::with('hasManyOrderGoods')->find(16); + // 经销商升级模拟 + // $model = Order::with('hasManyOrderGoods')->find(34); // $set = \Setting::get('plugin.team_dividend'); // (new NewUpgrateJob($model->uid, $set, $model->uniacid, TeamDividendLevelUpgrade::ORDER_PAY, $model))->handle(); // 经销商提成模拟 - // $order = Order::find(16); + // $order = Order::find(43); // $TeamReturnService = ReturnConfig::getClass(); // if (app('plugins')->isEnabled('team-sideways')) debug('经销商订单创建终止:team-sideways'); // $set = $order->getSetting('plugin.team_dividend'); diff --git a/plugins/team-dividend/src/models/TeamDividendAgencyModel.php b/plugins/team-dividend/src/models/TeamDividendAgencyModel.php index bc4063bb..93af7c39 100644 --- a/plugins/team-dividend/src/models/TeamDividendAgencyModel.php +++ b/plugins/team-dividend/src/models/TeamDividendAgencyModel.php @@ -239,7 +239,13 @@ class TeamDividendAgencyModel extends BackendModel if (!$uids = MemberShopInfo::uniacid()->where('parent_id',$pid)->pluck('member_id')->toArray()){ return 0; } - return self::uniacid()->whereIn('uid',$uids)->where('level', $level)->count(DB::raw("distinct(uid)")); + return self::uniacid()->whereIn('uid',$uids) + ->where(function($query) use ($level){ + $query->where('level',$level) + ->orWhere('cultural_level_id',$level); + }) + // ->where('level', $level) + ->count(DB::raw("distinct(uid)")); // return self::uniacid() // ->where('parent_id', $pid) // ->where('level', $level) diff --git a/plugins/team-dividend/src/models/TeamDividendModel.php b/plugins/team-dividend/src/models/TeamDividendModel.php index 0efa8789..24902575 100644 --- a/plugins/team-dividend/src/models/TeamDividendModel.php +++ b/plugins/team-dividend/src/models/TeamDividendModel.php @@ -201,13 +201,13 @@ class TeamDividendModel extends BaseModel $this->TypeService = '额外分红'; break; case 4: - $this->TypeService = '服务受益'; + $this->TypeService = '经销商受益';//生态建设 break; case 5: $this->TypeService = '生态贡献'; break; case 6: - $this->TypeService = '经销商受益'; + $this->TypeService = '生态服务';// 生态服务 break; } } @@ -475,7 +475,7 @@ class TeamDividendModel extends BaseModel * Author: wu-hui * Time: 2023/11/20 15:15 * @param int $uid 用户id - * @param int $type 4=服务受益，5=生态贡献，6=经销商受益 + * @param int $type 4=生态建设，5=生态贡献，6=生态服务 * @param string $incomeStatus all=全部收益；undrawn=未提现收益，withdrawn=已提现收益 * @return mixed */ diff --git a/plugins/team-dividend/src/services/GetAmountService.php b/plugins/team-dividend/src/services/GetAmountService.php index e299e9da..ea383e84 100644 --- a/plugins/team-dividend/src/services/GetAmountService.php +++ b/plugins/team-dividend/src/services/GetAmountService.php @@ -335,7 +335,7 @@ class GetAmountService } } - // 获取经销商受益比例 + // 获取生态服务比例 public function getServiceRatio(){ // 商品独立设置 else 基础设置 if($this->hasDividend()){ diff --git a/plugins/team-dividend/src/services/TeamReturnService.php b/plugins/team-dividend/src/services/TeamReturnService.php index 39d8dd44..9634e643 100644 --- a/plugins/team-dividend/src/services/TeamReturnService.php +++ b/plugins/team-dividend/src/services/TeamReturnService.php @@ -62,7 +62,7 @@ class TeamReturnService protected $flat_prize_limit; - private $dividendType = 0;// 分红类型：0=普通经销商提成，1=文创经销商服务受益 + private $dividendType = 0;// 分红类型：0=普通经销商提成，1=文创经销商生态建设 private $upUserDividendAmount = 0;// 上一位用户的经销商佣金提成金额 只有存在佣金时才会刷新该数据，如果用户为领取佣金则该金额保留 直到某位用户获取佣金为止 @@ -117,6 +117,8 @@ class TeamReturnService $this->gratitudeAward($agent); // 经销商奖励 $this->dividendAward($agent); + // 生态服务 + if($this->dividendType == 1) $this->dividendAwardService($agent); // 平级奖 $this->hierarchyAward($agent); // 额外分红 @@ -251,16 +253,13 @@ class TeamReturnService } // 属性赋值 $this->setAttributeTheValue($dividendData['dividend_amount'], $agent); - - // 经销商受益 - if($this->dividendType == 1) $this->dividendAwardService($agent); } - // 经销商受益 + // 生态服务 private function dividendAwardService($agent){ - // 经销商受益比例 + // 生态服务比例 $ratio = $this->amount_service->getServiceRatio(); - // 经销商受益金额 + // 生态服务金额 $dividend_amount = $this->amount_service->getDividendAmount($ratio); if($dividend_amount <= 0) return; // 计算基数 @@ -272,7 +271,7 @@ class TeamReturnService 'dividend_rate' => $ratio, 'lower_level_rate' => $this->finish_ratio_service ?: 0 ]; - // 经销商受益 + // 生态服务受益 $dividend_model = $this->addDividend($agent,$dividendData); $member = Member::getMemberByUid($agent['uid'])->with('hasOneFans')->first(); $notice = [ @@ -540,7 +539,7 @@ class TeamReturnService 'culate_method' => intval($this->set['culate_method']) ?: 0, 'created_at' => time(), ]; - // 判断：如果当前是 文创服务受益 修改对应的类型值 + // 判断：如果当前是 文创生态建设 修改对应的类型值 if($this->dividendType == 1 && $dividendData['type'] < 6) { if($dividendData['type'] == 1) $dividendData['type'] = 5; else if($dividendData['type'] == 0) $dividendData['type'] = 4; @@ -633,7 +632,7 @@ class TeamReturnService $this->obtainInfos = []; // 上一位获取的佣金 只有存在新佣金时才会刷新，否则不刷新 $this->upUserDividendAmount = 0; - // 已获得经销商受益奖励的比例 + // 已获得生态服务奖励的比例 $this->finish_ratio_service = 0; } } \ No newline at end of file diff --git a/plugins/team-dividend/src/services/upgrate/UpgrateConditionService.php b/plugins/team-dividend/src/services/upgrate/UpgrateConditionService.php index 47a3119e..9873b7e8 100644 --- a/plugins/team-dividend/src/services/upgrate/UpgrateConditionService.php +++ b/plugins/team-dividend/src/services/upgrate/UpgrateConditionService.php @@ -1896,9 +1896,12 @@ class UpgrateConditionService{ ->first(); // 本级 else 以上 if($this->upgradeParase['oneself'] == 0){ - $build = MemberChild::select(['yz_member_children.child_id','yz_team_dividend_agency.level','yz_member_children.member_id']) + $build = MemberChild::select(['yz_member_children.child_id','yz_team_dividend_agency.level','yz_team_dividend_agency.cultural_level_id','yz_member_children.member_id']) ->join('yz_team_dividend_agency','yz_member_children.child_id','yz_team_dividend_agency.uid') - ->where('yz_team_dividend_agency.level',$levelId); + ->where(function($query) use ($levelId){ + $query->where('yz_team_dividend_agency.level',$levelId) + ->orWhere('yz_team_dividend_agency.cultural_level_id',$levelId); + }); // ->whereHas('hasOneTeam', function ($teamModel) use ($levelId) { // $teamModel->where('level', $levelId); // }); @@ -1919,9 +1922,15 @@ class UpgrateConditionService{ } $build = MemberChild::select(['yz_member_children.child_id','yz_team_dividend_agency.level','yz_member_children.member_id']) ->join('yz_team_dividend_agency','yz_member_children.child_id','yz_team_dividend_agency.uid') - ->whereIn('yz_team_dividend_agency.level',$levelIds); + ->where(function($query) use ($levelIds){ + $query->whereIn('yz_team_dividend_agency.level',$levelIds) + ->orWhereIn('yz_team_dividend_agency.cultural_level_id',$levelIds); + }); $selfBuild = TeamDividendAgencyModel::select() - ->whereIn('level',$levelIds); + ->where(function($query) use ($levelIds){ + $query->whereIn('yz_team_dividend_agency.level',$levelIds) + ->orWhereIn('yz_team_dividend_agency.cultural_level_id',$levelIds); + }); } return [ 'build' => $build, diff --git a/plugins/team-dividend/views/admin/dividend-list.blade.php b/plugins/team-dividend/views/admin/dividend-list.blade.php index 1b6a9f6a..1b375797 100644 --- a/plugins/team-dividend/views/admin/dividend-list.blade.php +++ b/plugins/team-dividend/views/admin/dividend-list.blade.php @@ -65,9 +65,9 @@ - + - + diff --git a/plugins/team-dividend/views/admin/goods.blade.php b/plugins/team-dividend/views/admin/goods.blade.php index c0b31d0f..a9f06c0f 100644 --- a/plugins/team-dividend/views/admin/goods.blade.php +++ b/plugins/team-dividend/views/admin/goods.blade.php @@ -67,8 +67,8 @@ 经销商等级 - 提成比例/服务受益比例 - 经销商受益比例 + 提成比例/{{--生态建设--}}经销商受益比例 + 生态服务比例 @if( $teamSet['is_extra_award'] ) 额外奖励 @endif diff --git a/plugins/team-dividend/views/admin/level-set-add.blade.php b/plugins/team-dividend/views/admin/level-set-add.blade.php index 5688fbec..87d617fc 100644 --- a/plugins/team-dividend/views/admin/level-set-add.blade.php +++ b/plugins/team-dividend/views/admin/level-set-add.blade.php @@ -164,7 +164,8 @@
@@ -179,7 +180,7 @@
- +
@@ -1287,7 +1288,8 @@ val = parseInt(val) && !isNaN(parseInt(val)) ? parseInt(val) : parseInt(0); // 0=普通等级 1=文创等级 if(val === parseInt(1)){ - $("#dividend_ratio_text").html('服务受益比例'); + // $("#dividend_ratio_text").html('生态建设比例'); + $("#dividend_ratio_text").html('经销商受益比例'); $("#commission_ratio_set_content").removeClass('hide'); }else{ $("#dividend_ratio_text").html('提成比例'); diff --git a/plugins/team-dividend/views/admin/level-set.blade.php b/plugins/team-dividend/views/admin/level-set.blade.php index 8efa6955..5501ab59 100644 --- a/plugins/team-dividend/views/admin/level-set.blade.php +++ b/plugins/team-dividend/views/admin/level-set.blade.php @@ -29,8 +29,8 @@ 等级名称 等级类型 提成比例(%) - 服务受益比例(%) - 经销商受益比例(%) + {{--生态建设--}}经销商受益比例(%) + 生态服务比例(%) {{--激活码发放--}} 平级奖励层级 平级奖励比例 diff --git a/plugins/team-dividend/views/admin/team-agency.blade.php b/plugins/team-dividend/views/admin/team-agency.blade.php index e0906856..945a733f 100644 --- a/plugins/team-dividend/views/admin/team-agency.blade.php +++ b/plugins/team-dividend/views/admin/team-agency.blade.php @@ -132,7 +132,8 @@ 提成比例
累计提成
- 服务受益比例
累计服务受益 + {{--生态建设比例
累计生态建设--}} + 经销商受益比例
累计经销商受益 已结算提成
未结算提成 黑名单
变动时间 diff --git a/plugins/team-dividend/views/admin/withdraw-set.blade.php b/plugins/team-dividend/views/admin/withdraw-set.blade.php index 19358321..44897d49 100644 --- a/plugins/team-dividend/views/admin/withdraw-set.blade.php +++ b/plugins/team-dividend/views/admin/withdraw-set.blade.php @@ -101,14 +101,14 @@
-
经销商受益设置
+
生态服务设置
- 当经销商受益达到此额度时才能提现 + 当生态服务达到此额度时才能提现
@@ -151,14 +151,14 @@
-
服务受益设置
+
{{--生态建设--}}经销商受益设置
- 当服务受益达到此额度时才能提现 + 当{{--生态建设--}}经销商受益达到此额度时才能提现
diff --git a/plugins/team-dividend/views/widget/profit/dealerCommission.js b/plugins/team-dividend/views/widget/profit/dealerCommission.js index e7fa8857..f435d4cf 100644 --- a/plugins/team-dividend/views/widget/profit/dealerCommission.js +++ b/plugins/team-dividend/views/widget/profit/dealerCommission.js @@ -40,10 +40,10 @@ define({
经销商等级
-
提成比例/服务受益比例
+
提成比例/经销商受益比例
 -
经销商受益比例
+
生态服务比例
额外奖励
diff --git a/plugins/weight-value/src/models/WeightValue.php b/plugins/weight-value/src/models/WeightValue.php index 608e60da..7224ca2b 100644 --- a/plugins/weight-value/src/models/WeightValue.php +++ b/plugins/weight-value/src/models/WeightValue.php @@ -890,7 +890,7 @@ class WeightValue extends BaseModel{ * @return BaseModel */ private function getTeamDividendModel($uid,$teamLevelId){ - // 分红类型：0=分红佣金，1=平级奖，2=感恩奖励，3=额外分红，4=服务受益，5=生态贡献(服务受益平级奖)，6=经销商受益 + // 分红类型：0=分红佣金，1=平级奖，2=感恩奖励，3=额外分红，4=生态建设，5=生态贡献(生态建设平级奖)，6=生态服务 return TeamDividendModel::uniacid() ->where('member_id',$uid) ->where('agent_level',$teamLevelId)// 已结算