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-15 19:02:45 +08:00
parent 2ec492f449
commit 7378b64c82
20 changed files with 147 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/models/Income.php
View File

@ -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)

2
app/common/services/wordanalysis/dict/not-build/base_dic_full.txt
View File

@ -131042,7 +131042,7 @@
理论依据,1,xs
生产上,1,xs
生产性建设,1,xs
生态建设,1,xs
服务受益,1,xs
生活上,1,xs
用一句话来说,1,xs
用意何在,1,xs

16
app/frontend/modules/finance/controllers/IncomeController.php
View File

@ -139,6 +139,7 @@ class IncomeController extends ApiController
'yz_team_dividend.type as team_dividend_type',
'yz_commission_order.level_type as commission_type',
'yz_commission_order.hierarchy as commission_hierarchy',
'yz_shareholder_dividend.income_type as shareholder_dividend_type',
])
->leftJoin('yz_team_dividend', function ($join){
@ -196,10 +197,13 @@ class IncomeController extends ApiController
if($incomeModel){
$incomeModel = $incomeModel->toArray();
foreach($incomeModel['data'] as &$incomeItem){
if($incomeItem['commission_type'] == 1) $incomeItem['type_name'] = '销售受益';
else if($incomeItem['team_dividend_type'] == 4) $incomeItem['type_name'] = '生态建设';
if($incomeItem['commission_type'] == 1){
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'] == 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']){
@ -212,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'] = '生态建设';
// 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':

49
app/frontend/modules/finance/controllers/IncomeWithdrawController.php
View File

@ -513,28 +513,45 @@ 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',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();
}
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)
->select(['yz_member_income.id','yz_member_income.amount'])
->where('yz_member_income.created_at', '<',$startTime)
->get()
->toArray();
}
else if($income['type'] == 'ecological_contribution'){
// 生态贡献
@ -566,8 +583,8 @@ class IncomeWithdrawController extends ApiController
->get()->toArray();
}
else if($income['type'] == 'commission_share_reward'){
// 分销商分红 - 销售受益
$amountList = CommissionOrder::getIncome((int)$uid,(int)1,'undrawn')
// 分销商分红 - 销售受益( todo 修改：2023-12-15 提取分销商直推奖)
$amountList = CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',1)
->select(['yz_member_income.id','yz_member_income.amount'])
->get()->toArray();
}

6
plugins/commission/src/PluginApplication.php
View File

@ -43,6 +43,12 @@ class PluginApplication extends \app\common\services\PluginApplication
'type' => 'commission_share_reward',
'type_name' => '销售受益',
'class' => 'Yunshop\Commission\models\CommissionOrder',
],
'ecological_construction' => [
'title' => '服务受益',
'type' => 'ecological_construction',
'type_name' => '服务受益',
'class' => 'Yunshop\Commission\models\CommissionOrder',
]
];
}

6
plugins/commission/src/models/CommissionOrder.php
View File

@ -546,9 +546,10 @@ class CommissionOrder extends BaseModel
* @param int $uid
* @param int $levelType
* @param string $incomeStatus
* @param int $hierarchy
* @return mixed
*/
public static function getIncome(int $uid,int $levelType,string $incomeStatus = 'all'){
public static function getIncome(int $uid,int $levelType,string $incomeStatus = 'all',int $hierarchy = 0){
// $levelType 0=普通分销商订单，1=文创分销商订单
return self::uniacid()
->leftJoin('yz_member_income', function ($join) {
@ -559,6 +560,9 @@ class CommissionOrder extends BaseModel
->where('yz_commission_order.member_id',$uid)
->when($incomeStatus != 'all',function($query) use ($incomeStatus){
$query->where('yz_member_income.status',$incomeStatus == 'undrawn' ? 0 : 1);
})
->when($hierarchy > 0,function($query) use ($hierarchy){
$query->where('yz_commission_order.hierarchy',$hierarchy);
});
}

68
plugins/cultural-space/src/api/IndexController.php
View File

@ -70,9 +70,8 @@ class IndexController extends ApiController{
$uid = \YunShop::app()->getMemberId();
// 根据类型获取对应的列表
switch($keyName){
// 服务收益明细 || 生态建设
// 服务收益明细
case 'service_income':
case 'ecological_construction':
$result = TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4)
->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'])
->paginate(20)
@ -141,7 +140,7 @@ class IndexController extends ApiController{
case 'shareholding_income':$result = [];break;
// 销售受益明细
case 'share_reward':
$result = CommissionOrder::getIncome((int)$uid,(int)1)
$result = CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',1)
->select([
'yz_commission_order.created_at',
'yz_member_income.amount'
@ -149,9 +148,23 @@ class IndexController extends ApiController{
->paginate(20)
->toArray();
break;
// 生态服务
// 服务受益
case 'ecological_construction':
$result = CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',2)
->select([
'yz_commission_order.created_at',
'yz_member_income.amount'
])
->paginate(20)
->toArray();
break;
// 经销商受益
case 'ecological_services':
$result = TeamDividendModel::getTypeTotalIncome((int)$uid,(int)6)
// $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'])
// ->paginate(20)
// ->toArray();
$result = TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4)
->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'])
->paginate(20)
->toArray();
@ -497,12 +510,14 @@ class IndexController extends ApiController{
->groupBy('yz_withdraw_income_apply.withdraw_id')
->sum('yz_withdraw.poundage');*/
// ( todo 修改：2023-12-15 生态发展改为销售受益，提取分销商直推奖；生态建设改为服务受益，提取分销商间推奖；生态服务改为经销商受益，提取之前的经销商生态建设奖。)
$info = [
'service_income' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4)->sum('yz_member_income.amount'),// 生态建设
// 'service_income' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4)->sum('yz_member_income.amount'),// 生态建设
'service_income' => CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',2)->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'),// 销售受益
// 'commission' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)6)->sum('yz_member_income.amount'),// 生态服务
'commission' => TeamDividendModel::getTypeTotalIncome((int)$uid,(int)4)->sum('yz_member_income.amount'),// 经销商受益
'share_reward' => CommissionOrder::getIncome((int)$uid,(int)1,'undrawn',1)->sum('yz_member_income.amount'),// 销售受益
// 'commission' => $poundage,// 总手续费
// 'withdrawal' => $amount,// 总提现金额
];
@ -548,7 +563,7 @@ class IndexController extends ApiController{
return $this->successJson('success',$info);
}
/**
* Common: 新文创空间数据 - 获获取相关信息列表
* Common: 新文创空间数据 - 获取相关信息列表
* Author: wu-hui
* Time: 2023/12/01 18:18
* @return \Illuminate\Http\JsonResponse
@ -562,19 +577,44 @@ class IndexController extends ApiController{
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'])
// ->leftJoin('yz_team_dividend','yz_team_dividend.id','yz_member_income.incometable_id')
// ->leftJoin('yz_withdraw_income_apply','yz_withdraw_income_apply.income_id','yz_member_income.id')
// ->leftJoin('yz_withdraw','yz_withdraw.id','yz_withdraw_income_apply.withdraw_id')
// ->where('yz_member_income.incometable_type', 'Yunshop\TeamDividend\models\TeamDividendModel')
// ->where('yz_member_income.status', Income::STATUS_WITHDRAW)
// ->where('yz_member_income.member_id', $uid)
// ->whereIn('yz_team_dividend.type', [4,5,6])
// ->groupBy('yz_withdraw_income_apply.withdraw_id')
// ->orderBy('yz_withdraw.created_at','DESC')
// ->paginate(20)
// ->toArray();
$result = Income::uniacid()
->select(['yz_withdraw.amounts','yz_withdraw.id','yz_withdraw.created_at','yz_withdraw.actual_amounts','yz_withdraw.poundage','yz_withdraw.status'])
->leftJoin('yz_team_dividend','yz_team_dividend.id','yz_member_income.incometable_id')
->leftJoin('yz_commission_order', function ($join) {
$join->on('yz_commission_order.member_id', 'yz_member_income.member_id')
->on('yz_commission_order.id', 'yz_member_income.incometable_id')
->where('yz_member_income.dividend_code',1)
->where('yz_commission_order.level_type',1);
})
->leftJoin('yz_team_dividend', function ($join) {
$join->on('yz_team_dividend.member_id', 'yz_member_income.member_id')
->on('yz_team_dividend.id', 'yz_member_income.incometable_id')
->where('yz_member_income.dividend_code',2)
->where('yz_team_dividend.type',4);
})
->leftJoin('yz_withdraw_income_apply','yz_withdraw_income_apply.income_id','yz_member_income.id')
->leftJoin('yz_withdraw','yz_withdraw.id','yz_withdraw_income_apply.withdraw_id')
->where('yz_member_income.incometable_type', 'Yunshop\TeamDividend\models\TeamDividendModel')
->where('yz_member_income.member_id',$uid)
->where('yz_member_income.status', Income::STATUS_WITHDRAW)
->where('yz_member_income.member_id', $uid)
->whereIn('yz_team_dividend.type', [4,5,6])
->groupBy('yz_withdraw_income_apply.withdraw_id')
->orderBy('yz_withdraw.created_at','DESC')
->paginate(20)
->toArray();
break;
// 贡献分享分红
case 'contribution':

4
plugins/cultural-space/src/models/CulturalSpace.php
View File

@ -324,11 +324,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');

12
plugins/team-dividend/src/PluginApplication.php
View File

@ -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' => [

6
plugins/team-dividend/src/models/TeamDividendModel.php
View File

@ -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
*/

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

@ -335,7 +335,7 @@ class GetAmountService
}
}
// 获取生态服务比例
// 获取经销商受益比例
public function getServiceRatio(){
// 商品独立设置 else 基础设置
if($this->hasDividend()){

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

@ -62,7 +62,7 @@ class TeamReturnService
protected $flat_prize_limit;
private $dividendType = 0;// 分红类型：0=普通经销商提成，1=文创经销商生态建设
private $dividendType = 0;// 分红类型：0=普通经销商提成，1=文创经销商服务受益
private $upUserDividendAmount = 0;// 上一位用户的经销商佣金提成金额 只有存在佣金时才会刷新该数据，如果用户为领取佣金则该金额保留 直到某位用户获取佣金为止
@ -252,15 +252,15 @@ 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 +272,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 +540,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 +633,7 @@ class TeamReturnService
$this->obtainInfos = [];
// 上一位获取的佣金 只有存在新佣金时才会刷新，否则不刷新
$this->upUserDividendAmount = 0;
// 已获得生态服务奖励的比例
// 已获得经销商受益奖励的比例
$this->finish_ratio_service = 0;
}
}

4
plugins/team-dividend/views/admin/dividend-list.blade.php
View File

@ -65,9 +65,9 @@
<option value='1' @if($search['type'] == '1') selected @endif>平级奖励</option>
<option value='2' @if($search['type'] == '2') selected @endif>感恩奖励</option>
<option value='3' @if($search['type'] == '3') selected @endif>额外分红</option>
<option value='4' @if($search['type'] == '4') selected @endif>生态建设</option>
<option value='4' @if($search['type'] == '4') selected @endif>服务受益</option>
<option value='5' @if($search['type'] == '5') selected @endif>生态贡献</option>
<option value='5' @if($search['type'] == '6') selected @endif>生态服务</option>
<option value='5' @if($search['type'] == '6') selected @endif>经销商受益</option>
</select>
</div>

4
plugins/team-dividend/views/admin/goods.blade.php
View File

@ -67,8 +67,8 @@
<thead >
<tr>
<th class="col-sm-2 col-xs-2">经销商等级</th>
<th class="col-sm-4 col-xs-4">提成比例/生态建设比例</th>
<th class="col-sm-4 col-xs-4">生态服务比例</th>
<th class="col-sm-4 col-xs-4">提成比例/服务受益比例</th>
<th class="col-sm-4 col-xs-4">经销商受益比例</th>
@if( $teamSet['is_extra_award'] )
<th class="col-sm-4 col-xs-4">额外奖励</th>
@endif

6
plugins/team-dividend/views/admin/level-set-add.blade.php
View File

@ -164,7 +164,7 @@
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">
<span id="dividend_ratio_text">{{ $dividend->level_type == 1 ? '生态建设比例' : '提成比例' }}</span>
<span id="dividend_ratio_text">{{ $dividend->level_type == 1 ? '服务受益比例' : '提成比例' }}</span>
</label>
<div class="col-sm-6 col-xs-6">
<div class='input-group'>
@ -179,7 +179,7 @@
<div class="form-group @if($dividend->level_type != 1) hide @endif " id="commission_ratio_set_content">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">生态服务比例</label>
<label class="col-xs-12 col-sm-3 col-md-2 control-label">经销商受益比例</label>
<div class="col-sm-6 col-xs-6">
<div class='input-group'>
<input type='text' name='dividend[commission_ratio]' oninput="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)" class="form-control discounts_value" value="{{$dividend->commission_ratio?$dividend->commission_ratio:0}}"/>
@ -1287,7 +1287,7 @@
val = parseInt(val) && !isNaN(parseInt(val)) ? parseInt(val) : parseInt(0);
// 0=普通等级 1=文创等级
if(val === parseInt(1)){
$("#dividend_ratio_text").html('生态建设比例');
$("#dividend_ratio_text").html('服务受益比例');
$("#commission_ratio_set_content").removeClass('hide');
}else{
$("#dividend_ratio_text").html('提成比例');

4
plugins/team-dividend/views/admin/level-set.blade.php
View File

@ -29,8 +29,8 @@
<th style="text-align: center;">等级名称</th>
<th style="text-align: center;">等级类型</th>
<th style="width: 150px;text-align: center;">提成比例(%)</th>
<th style="width: 150px;text-align: center;">生态建设比例(%)</th>
<th style="width: 150px;text-align: center;">生态服务比例(%)</th>
<th style="width: 150px;text-align: center;">服务受益比例(%)</th>
<th style="width: 150px;text-align: center;">经销商受益比例(%)</th>
{{--<th style="width: 245px;text-align: center;">激活码发放</th>--}}
<th style="width: 150px;text-align: center;">平级奖励层级</th>
<th style="width: 150px;text-align: center;">平级奖励比例</th>

2
plugins/team-dividend/views/admin/team-agency.blade.php
View File

@ -132,7 +132,7 @@
<th width="8.5%">
提成比例<br>累计提成
<hr style="margin: 5px 0!important;"/>
生态建设比例<br>累计生态建设
服务受益比例<br>累计服务受益
</th>
<th width="8.5%">已结算提成<br>未结算提成</th>
<th width="13%">黑名单<br>变动时间</th>

8
plugins/team-dividend/views/admin/withdraw-set.blade.php
View File

@ -101,14 +101,14 @@
<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[ecological_services][roll_out_limit]" class="form-control"
value="{{$ecological_services['roll_out_limit']}}"/>
<span class="help-block">当生态服务达到此额度时才能提现</span>
<span class="help-block">当经销商受益达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
@ -151,14 +151,14 @@
<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[ecological_construction][roll_out_limit]" class="form-control"
value="{{$ecological_construction['roll_out_limit']}}"/>
<span class="help-block">当生态建设达到此额度时才能提现</span>
<span class="help-block">当服务受益达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">

4
plugins/team-dividend/views/widget/profit/dealerCommission.js
View File

@ -40,10 +40,10 @@ define({
<div class="grid-content bg-purple">经销商等级</div>
</el-col>
<el-col :span="8">
<div class="grid-content bg-purple">提成比例/生态建设比例</div>
<div class="grid-content bg-purple">提成比例/服务受益比例</div>
</el-col>
<el-col :span="4">
<div class="grid-content bg-purple">生态服务比例</div>
<div class="grid-content bg-purple">经销商受益比例</div>
</el-col>
<el-col :span="4">
<div class="grid-content bg-purple" v-if="teamSet.is_extra_award == 1">额外奖励</div>

2
plugins/weight-value/src/models/WeightValue.php
View File

@ -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)// 已结算