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-18 16:18:08 +08:00
parent 0ed45cc83b
commit 1f3f06d286
22 changed files with 116 additions and 89 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)

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

@ -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':

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

@ -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();
}

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

@ -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',
]

7
plugins/cultural-space/src/admin/IndexController.php
View File

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

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

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

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

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

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/admin/TeamAgencyController.php
View File

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

8
plugins/team-dividend/src/models/TeamDividendAgencyModel.php
View File

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

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()){

19
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;// 上一位用户的经销商佣金提成金额 只有存在佣金时才会刷新该数据，如果用户为领取佣金则该金额保留 直到某位用户获取佣金为止
@ -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;
}
}

17
plugins/team-dividend/src/services/upgrate/UpgrateConditionService.php
View File

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

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

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

@ -164,7 +164,8 @@
<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>--}}
<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 +180,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 +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('提成比例');

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>

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

@ -132,7 +132,8 @@
<th width="8.5%">
提成比例<br>累计提成
<hr style="margin: 5px 0!important;"/>
服务受益比例<br>累计服务受益
{{--生态建设比例<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)// 已结算