将官方渠道修改为江息网络

master
zhengyongxing 5 years ago
parent 6da0ec1607
commit 4ff957d0f1

@ -1109,7 +1109,7 @@ function get_promote_parent_acc($promote_id){
$data = $Promote->field('account,parent_id,chain')->find($promote_id);
if(empty($data)){
return $data["account"]="官方渠道";exit;
return $data["account"]=C('OFFICIEL_CHANNEL');exit;
}
$chain = trim($data['chain'], '/');
if ($chain == '') {

@ -112,4 +112,5 @@ return array(
'TMPL_EXCEPTION_FILE' => MODULE_PATH.'View/Public/exception.html',// 异常页面的模板文件
/*默认公司名称*/
'DEFAULT_COMPANY'=>"海南万盟天下科技有限公司",
'OFFICIEL_CHANNEL'=>"江息网络"
);

@ -192,7 +192,7 @@ class AjaxController extends ThinkController{
$item['nickname'] = $item['account'] . ($item['nickname'] ? "({$item['nickname']})" : "");
}
if($company_id <= 0){
array_unshift($data,["id"=>0,"nickname"=>"官方渠道","account"=>"官方渠道","company_id"=>0]);
array_unshift($data,["id"=>0,"nickname"=>C('OFFICIEL_CHANNEL'),"account"=>C('OFFICIEL_CHANNEL'),"company_id"=>0]);
}
$this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>$data]);

@ -3620,7 +3620,7 @@ class ExportController extends Controller
->where($map)
->find();
}
$authorityData['promote_account'] = "官方渠道";
$authorityData['promote_account'] = C('OFFICIEL_CHANNEL');
$authorityData['id'] = "1";
if (isset($_REQUEST['promote_id'])||$authorityData['count']==0) {
$authorityData = [];

@ -854,6 +854,7 @@ class FinanceController extends ThinkController
$data[$key]['pay_way'] = getPayType($value['pay_way']);
$data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']);
$data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
($data[$key]['promote_account']=='官方渠道')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):'';
if (isset($_REQUEST['export'])) {
checkEncryptionAuth($data[$key]['user_account'],'gameStatisticsDetail');

@ -120,6 +120,21 @@ class FinancePromoteController extends AdminController
if(!array_key_exists('bind_coin_count',$v)) $v['bind_coin_count']=0;
if(!array_key_exists('inside_cash_count',$v)) $v['inside_cash_count']=0;
$v['promote_account'] = get_promote_name($v['p_id']);
if ($v['admin_id']) {
$v['admin_id'] = get_admin_account($v['admin_id']);
} else {
$v['admin_id'] = '无';
}
if ($v['develop_type'] == 1) {
$v['develop_type'] = '自主开发';
} elseif($v['develop_type'] == 2) {
$v['develop_type'] = '自主开发及维护';
} elseif($v['develop_type'] == 3) {
$v['develop_type'] = '只维护';
} else {
$v['develop_type'] = '未设定';
}
$v['inside_cash_count'] = number_format($v['inside_cash_count'],2,'.','');
$v['allcount'] = number_format($v['cash_count']-0+$v['balance_coin_count']+$v['bind_coin_count'],2,'.','');
@ -148,6 +163,7 @@ class FinancePromoteController extends AdminController
"allcount"=>"渠道游戏内充值合计"
));
}
$pagecount = count($data);
$page = set_pagination($pagecount, $row);
if ($page) {
@ -222,7 +238,7 @@ class FinancePromoteController extends AdminController
SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count,
IFNULL(if(substring_index(substring_index(promote.`chain`,'/',2),'/',-1)='',s.promote_id,substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) p_id,
IFNULL(company_id,0) company_id,company_name,IFNULL(promote.company_belong,0) company_belong";
IFNULL(company_id,0) company_id,company_name,IFNULL(promote.company_belong,0) company_belong,admin_id,develop_type";
return M()
->table("tab_spend s use index(promote_time)")
->field($field)
@ -239,7 +255,7 @@ class FinancePromoteController extends AdminController
$map['s.source_id']=0;
$field= "SUM(CASE WHEN s.type = 1 THEN num ELSE 0 END) as pay_amount,SUM(CASE WHEN s.type = 2 THEN num ELSE 0 END) as back_amount,IFNULL(if(substring_index(substring_index(`chain`,'/',2),'/',-1)='',
s.promote_id,substring_index(substring_index(`chain`,'/',2),'/',-1)),0) p_id,
IFNULL(company_id,0) company_id,company_name,IFNULL(promote.company_belong,0) company_belong";
IFNULL(company_id,0) company_id,company_name,IFNULL(promote.company_belong,0) company_belong,admin_id,develop_type";
return M("promote_coin s","tab_")
->field($field)
->where($map)
@ -323,7 +339,7 @@ class FinancePromoteController extends AdminController
$v['company_belong'] = getCompanyBlong($v['company_belong']);
if(empty($v['company_name'])) $v['company_name']= $this->COMPANY_NAME;
if(empty($v['promote_account'])) $v['promote_account']= "官方渠道";
if(empty($v['promote_account'])) $v['promote_account']= C('OFFICIEL_CHANNEL');
if(!array_key_exists('cash_count',$v)) $v['cash_count']=0;
if(!array_key_exists('balance_coin_count',$v)) $v['balance_coin_count']=0;
if(!array_key_exists('bind_coin_count',$v)) $v['bind_coin_count']=0;
@ -460,6 +476,7 @@ class FinancePromoteController extends AdminController
$value['inside_cash_count']?:0;
$value['all_cash_count'] = number_format($value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'],2,'.','');
$value['company_belong'] =getCompanyBlong($value['company_belong']);
($value['account']=='官方渠道')?($value['account']=C('OFFICIEL_CHANNEL')):'';
$value['game_name'] =clearGameNameType($value['game_name']);
$value['sdk_version'] =getGameTypeName($value['sdk_version']);
@ -589,6 +606,7 @@ class FinancePromoteController extends AdminController
$data[$key]['pay_way'] = getPayType($value['pay_way']);
$data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
$data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']);
($data[$key]['promote_account']=='官方渠道')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):'';
if (isset($_REQUEST['export'])) {
checkEncryptionAuth($data[$key]['user_account'],'gameStatisticsDetail');

@ -510,7 +510,7 @@ class GameController extends ThinkController
foreach($sociatyGames as $key => $value) {
$sociatyGamesData[$key]['id'] = $value['id'];
if($value['promote_id'] == -1) {
$sociatyGamesData[$key]['promoteAccount'] = "官方渠道";
$sociatyGamesData[$key]['promoteAccount'] = C('OFFICIEL_CHANNEL');
}else {
$promoteAccount = M('promote','tab_')->where(['id'=>$value['promote_id']])->getField('account');
$sociatyGamesData[$key]['promoteAccount'] = $promoteAccount;
@ -1229,7 +1229,7 @@ class GameController extends ThinkController
$promoteData = M('promote','tab_')->field('id as value,account as title')->where(array('level'=>1,'chain'=>'/'))->select();
$data_president = M('AuthGroup')->field('data_president')->where(array('id'=>1))->find();
$promoteData = array_merge([0=>['value'=>'-1','title'=>'官方渠道']],$promoteData);
$promoteData = array_merge([0=>['value'=>'-1','title'=>C('OFFICIEL_CHANNEL')]],$promoteData);
$returnData = array('data_president'=>$data_president['data_president'],'list'=>$promoteData);
$this->ajaxReturn(json_encode($returnData));

@ -663,6 +663,7 @@ class PayChannelController extends ThinkController
foreach ($data as $key => $value) {
$data[$key]['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']);
($data[$key]['promote_account']=='官方渠道')?($data[$key]['promote_account']=C('OFFICIEL_CHANNEL')):'';
if ($model == 'spend') {
$data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);

@ -521,7 +521,7 @@ class PlatformController extends ThinkController
$data = [];
foreach($tmdata as $k => $v){
if($v['id'] == 0){
$v['promote_account'] = "官方渠道";
$v['promote_account'] = C('OFFICIEL_CHANNEL');
}
$data[] = $v;
}

@ -318,7 +318,7 @@ class PromoteCompanyController extends ThinkController
$save['last_up_time'] = $time;
$save['contact_begin']=strtotime($save['contact_begin']);
$save['contact_end']=strtotime($save['contact_end']);
if(isset($save['resources'])){
$save['resources'] = json_encode($save['resources'],JSON_UNESCAPED_UNICODE);
}

@ -1561,7 +1561,7 @@ class QueryController extends ThinkController
if ($_REQUEST['promote_id']||$_REQUEST['promote_id']=='0') {
if ($_REQUEST['promote_id']=='0') {
unset($map['root_id']);
$map['promote_account'] = '官方渠道';
$map['promote_account'] = C('OFFICIEL_CHANNEL');
} else {
$map['root_id'] = $_REQUEST['promote_id'];
}
@ -1625,6 +1625,7 @@ class QueryController extends ThinkController
$gameName = substr($gameInfo,0,strpos($gameInfo,'('));
$gameMap['game_name'] = ['like','%'.$gameName.'%'];
$gameIdArr = M('game','tab_')->field('id')->where($gameMap)->select();
($data[$key]['account']=='官方渠道')?($data[$key]['account']=C('OFFICIEL_CHANNEL')):'';
$gameNameIdArr = [];
foreach($gameIdArr as $gameKey => $gameValue){
$gameNameIdArr[] = $gameValue['id'];

@ -90,10 +90,10 @@ class RechargeSumController extends ThinkController
$data[$key]['game_id'] = empty($_REQUEST['game_name']) ? "全部" : $_REQUEST['game_name'];
switch ($_REQUEST['promote_id']) {
case 'GUANFANG':
$data[$key]['promote_id'] = "官方渠道";
$data[$key]['promote_id'] = C('OFFICIEL_CHANNEL');
break;
case '0':
$data[$key]['promote_id'] = "官方渠道";
$data[$key]['promote_id'] = C('OFFICIEL_CHANNEL');
break;
case 'PROMOTE':
$data[$key]['promote_id'] = "推广渠道";

@ -125,6 +125,10 @@ class SpendController extends ThinkController
$data = D(self::model_name)->lists($_GET["p"], $map, $order);
foreach ($data['data'] as $key=>&$value ) {
($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):'';
}
$this->assign('startDate', $startDate);
$this->assign('endDate', $endDate);
$this->assign('list_data', $data['data']);

@ -186,7 +186,7 @@ class StatisticsCountSetController extends Controller {
$value['active_user_list'] = @json_encode(array_map("intFun",explode(",",$value['active_user_list'])));
if(empty($value['promote_account']) && $value['promote_id']){
if($value['promote_id'] == 0){
$value['promote_account'] = "官方渠道";
$value['promote_account'] = C('OFFICIEL_CHANNEL');
}else{
$value['promote_account'] = $this->PromoteModel->field("account")->where("id = {$value['promote_id']}")->find()['account'];
if(!$value['promote_account']){

@ -704,6 +704,11 @@ class UserController extends AdminController
empty(I('user_account')) || $map['user_account'] = ['like', "%" . I('user_account') . "%"];
$this->checkListOrCountAuthRestMap($map,["role_id", "role_name", "user_account"]);
$list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc');
foreach ($list as $key=>&$value ) {
($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):'';
}
$this->assign('list', $list);
$this->meta_title = '角色数据';

@ -404,7 +404,7 @@ class PromoteModel extends Model{
$userAuth = session('user_auth');
setPowerPromoteIds($where,'id');
$offcialData = [0=>['id'=>0,'nickname'=>'官方渠道']];
$offcialData = [0=>['id'=>0,'nickname'=>C('OFFICIEL_CHANNEL')]];
$result = $this->field("*")->where($where)->select();
foreach ($result as &$item) {

@ -60,7 +60,7 @@
<label>推广员账号:</label>
<select id="promote_id" name="promote_id" class="select_gallery" style="width:150px;">
<option value="">请选择推广员账号</option>
<option value="0">官方渠道</option>
<option value="0">{:C('OFFICIEL_CHANNEL')}</option>
<volist name=":get_promote_list(1)" id="vo">
<option promote-id="{$vo.id}" value="{$vo.id}">{$vo.account}</option>
</volist>

@ -160,16 +160,26 @@
<td>
<if condition="$data['promote_account'] eq '自然注册'">
<if condition="$show_data_power eq true ">
官方渠道
{:C('OFFICIEL_CHANNEL')}
<else />
官*******道
</if>
<else/>
<if condition="$show_data_power eq true ">
{$data.promote_account}
<if condition="$data.promote_account eq '官方渠道' ">
{:C('OFFICIEL_CHANNEL')}
<else/>
{$data.promote_account}
</if>
<else />
{$data.promote_account|encryptStr}
<if condition="$data.promote_account eq '官方渠道' ">
{:C('OFFICIEL_CHANNEL')}
<else/>
{$data.promote_account|encryptStr}
</if>
</if>
</if>
</td>

@ -107,7 +107,7 @@
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
<option value="">请选择会长</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>官方渠道</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>{:C('OFFICIEL_CHANNEL')}</option>
<option value="UC" <?php if ($_POST['promote_id'] == 'UC'):?>selected<?php endif;?>>UC用户</option>
</select>
</div>

@ -91,7 +91,7 @@
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
<option value="">请选择推广员</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>官方渠道</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>{:C('OFFICIEL_CHANNEL')}</option>
</select>
</div>
@ -361,7 +361,7 @@
data:{level:$("#promote_level option:selected").val()},
dataType:'json',
success:function(response){
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>';
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>{:C(\'OFFICIEL_CHANNEL\')}</option>';
// $.each(response.data, function(index, item){
// console.log(item.id);
// str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>';

@ -165,7 +165,9 @@
<tr>
<th>推广公司</th>
<th>会长渠道</th>
<th>开发类型</th>
<th>内外团</th>
<th>市场专员</th>
<th class="tooltip"><a class="paixu" data-order='cash_count'>
<if condition="$userarpu_order eq 4 and $userarpu_order_type eq 'cash_count'">游戏现金金额▲
@ -215,7 +217,9 @@
<tr>
<td>{$data.company_name}</td>
<td>{$data['promote_account']}</td>
<td>{$data['develop_type']}</td>
<td>{$data['company_belong']}</td>
<td>{$data['admin_id']}</td>
<td>{$data.cash_count}</td>
<td class="coin-detail" data-pay_type="0" style="color: #0066cc;cursor: pointer" data-url="{:U('FinancePromote/gameCoinDetail',array_merge(I('get.'),['pay_way'=>0,'promote_type'=>1,'promote_id'=>$data['p_id'],p=>1,row=>10]))}">
@ -248,7 +252,7 @@
</volist>
</empty>
<tr class="data_summary" style="text-align: center;">
<td colspan="3" style="text-align: center;">汇总:</td>
<td colspan="5" style="text-align: center;">汇总:</td>
<td style="text-align: center;">{$all_count['cash_count']}</td>
<td style="text-align: center;">{$all_count['balance_coin_count']}</td>
<td style="text-align: center;">{$all_count['bind_coin_count']}</td>

@ -105,7 +105,7 @@
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
<option value="">请选择会长</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>官方渠道</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>{:C('OFFICIEL_CHANNEL')}</option>
<option value="UC" <?php if ($_POST['promote_id'] == 'UC'):?>selected<?php endif;?>>UC用户</option>
</select>
</div>

@ -376,7 +376,7 @@
success: function (response) {
str = '<option value="">请选择会长</option>';
if(company_id == 0 || company_id ==-1){
str +='<option value="0"' + (promote_id && 0 == promote_id ? 'selected' : '') + '>官方渠道</option>';
str +='<option value="0"' + (promote_id && 0 == promote_id ? 'selected' : '') + '>{:C(\'OFFICIEL_CHANNEL\')}</option>';
}
data = response.data;
for (var i in data) {

@ -156,7 +156,7 @@
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
<option value="">请选择推广员</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>官方渠道</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>{:C('OFFICIEL_CHANNEL')}</option>
<option value="UC" <?php if ($_POST['promote_id'] == 'UC'):?>selected<?php endif;?>>UC用户</option>
</select>
</div>
@ -272,7 +272,7 @@
</if>
<td >
<if condition="$data['promote_account'] eq '自然注册'">
官方渠道
{:C('OFFICIEL_CHANNEL')}
<else/>
<empty name='data["promote_account"]'>---<else/>
<if condition="$show_data_power eq true ">

@ -74,7 +74,7 @@
<td class="r table_radio">
<select id="prmoote_id_to" name="prmoote_id_to" class="select_gallery">
<option value="">下拉选择</option>
<option value="-1">官方渠道</option>
<option value="-1">{:C('OFFICIEL_CHANNEL')}</option>
<volist name=":get_promote_list()" id="vo">
<option value="{$vo.id}">{$vo.account}{:get_parent_promoteto($vo['id'])}</option>
</volist>

@ -161,6 +161,17 @@
<input type="text" class="txt " name="bank_address" value="" placeholder="请输入账户名">
</td>
</tr>
<tr>
<td class="l">开发类型:</td>
<td class="r" >
<select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
<option value="">请选择开发类型</option>
<option value="1" >自主开发</option>
<option value="2" >自主开发及维护</option>
<option value="3" >只维护</option>
</select>
</td>
</tr>
<tr>
<td class="l">备注:</td>
<td class="r" >
@ -299,7 +310,8 @@
"bank_name":["nocheck","银行名称不能为空"],
"bank_address":["nocheck","银行开户网点不能为空"],
"content":["nocheck"],
"status":["nocheck","","radio"]
"status":["nocheck","","radio"],
"develop_type":["nocheck","开发类型不能为空","select"]
}
var cres = CIC.checkAddInput(obj);
if(!cres){

@ -165,6 +165,17 @@
<input type="text" class="txt " name="bank_address" value="{$data.bank_address}" placeholder="请输入账户名">
</td>
</tr>
<tr>
<td class="l">开发类型:</td>
<td class="r" >
<select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
<option value="">请选择开发类型</option>
<option value="1" <if condition="$data.develop_type eq 1">selected</if>>自主开发</option>
<option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>
<option value="3" <if condition="$data.develop_type eq 3">selected</if>>只维护</option>
</select>
</td>
</tr>
<tr>
<td class="l">备注:</td>
<td class="r" >
@ -368,7 +379,8 @@
"bank_name":[["nocheck",true],"银行名称不能为空"],
"bank_address":[["nocheck",true],"银行开户网点不能为空"],
"content":[["nocheck",true]],
"status":["nocheck","","radio"]
"status":["nocheck","","radio"],
"develop_type":["nocheck","开发类型不能为空","select"]
}
var cres = CIC.checkAddInput(obj);
if(!cres){

@ -164,6 +164,17 @@
<input type="text" class="txt " name="bank_address" value="{$data.bank_address}" readonly placeholder="请输入账户名">
</td>
</tr>
<tr>
<td class="l">开发类型:</td>
<td class="r" >
<select id="develop_type" name="develop_type" class="select_gallery" disabled="true" style="width: 215px;">
<option value="">请选择开发类型</option>
<option value="1" <if condition="$data.develop_type eq 1">selected</if>>自主开发</option>
<option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>
<option value="3" <if condition="$data.develop_type eq 3">selected</if>>只维护</option>
</select>
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px"></i>备注:</td>
<td class="r" >

@ -82,7 +82,7 @@
<td class="r">
<select id="promote_id" name="promote_id" class="select_2">
<option value="-1">全站玩家</option>
<option value="0">官方渠道</option>
<option value="0">{:C('OFFICIEL_CHANNEL')}</option>
<option value="-2">推广渠道</option>
</select>
</td>

@ -70,7 +70,7 @@
<td class="r">
<select id="promote_id_obj" name="promote_id" disabled="disabled">
<option value="-1">全站玩家</option>
<option value="0">官方渠道</option>
<option value="0">{:C('OFFICIEL_CHANNEL')}</option>
<option value="-2">推广渠道</option>
</select>
</td>

@ -78,7 +78,7 @@
<select name="promote_id" class="select_gallery" style="width:120px;">
<option value="">折扣对象</option>
<option value="-1">全站玩家</option>
<option value="0">官方渠道</option>
<option value="0">{:C('OFFICIEL_CHANNEL')}</option>
<option value="-2">推广渠道</option>
</select>
</div>

@ -74,7 +74,7 @@
<td class="r">
<select name="promote_id">
<option value="-1">全站玩家</option>
<option value="0">官方渠道</option>
<option value="0">{:C('OFFICIEL_CHANNEL')}</option>
<option value="1">推广渠道</option>
</select>
<span class="notice-text">设置不同对象可享受的返利,对象包含全站玩家、官方渠道、推广渠道</span>

@ -49,7 +49,7 @@
<td class="r">
<select name="promote_id" disabled="disabled">
<option value="-1">全站玩家</option>
<option value="0">官方渠道</option>
<option value="0">{:C('OFFICIEL_CHANNEL')}</option>
<option value="1">推广渠道</option>
</select>
<span class="notice-text">设置不同对象可享受的返利,对象包含全站玩家、官方渠道、推广渠道</span>

@ -114,7 +114,7 @@
<td>
<switch name="data.promote_id">
<case value="-1">全站玩家</case>
<case value="0">官方渠道</case>
<case value="0">{:C('OFFICIEL_CHANNEL')}</case>
<case value="1">推广渠道</case>
</switch>
</td>

@ -205,7 +205,7 @@
<gt name="data.small_id" value="0"><neq name="data.small_id" value="$data.user_id">{$data.small_account}</neq></gt></td>
<td>{$data.game_name}</td>
<td>
<eq name="data.promote_id" value="-1">官方渠道<else/>
<eq name="data.promote_id" value="-1">C('OFFICIEL_CHANNEL')<else/>
<!-- <if condition="$is_admin eq true ">
{:get_promote_account($data['promote_id'])}
<else />

@ -125,7 +125,7 @@
<td>{$data.game_name}</td>
<td>
<if condition="$data.promote_account == '自然注册'">
官方渠道
{:C('OFFICIEL_CHANNEL')}
<else />
{$data.promote_account}
</if>
@ -391,7 +391,7 @@
data:{level:$("#promote_level option:selected").val()},
dataType:'json',
success:function(response){
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>';
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>{:C(\'OFFICIEL_CHANNEL\')}</option>';
data = response.data;
for (var i in data){
str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"

@ -393,7 +393,7 @@
data:{level:$("#promote_level option:selected").val()},
dataType:'json',
success:function(response){
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>';
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>{:C(\'OFFICIEL_CHANNEL\')}</option>';
data = response.data;
for (var i in data){
str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"

@ -196,7 +196,7 @@
data:{level:$("#promote_level option:selected").val()},
dataType:'json',
success:function(response){
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option><option value="UC"'+(promote_id && 'UC' == promote_id?'selected':'')+'>UC渠道</option>';
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>{:C(\'OFFICIEL_CHANNEL\')}</option><option value="UC"'+(promote_id && 'UC' == promote_id?'selected':'')+'>UC渠道</option>';
// $.each(response.data, function(index, item){
// console.log(item.id);
// str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>';

@ -75,7 +75,7 @@
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
<option value="">请选择推广员</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>官方渠道</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>{:C('OFFICIEL_CHANNEL')}</option>
<option value="UC" <?php if ($_POST['promote_id'] == 'UC'):?>selected<?php endif;?>>UC用户</option>
</select>
</div>
@ -238,7 +238,7 @@
data:{level:$("#promote_level option:selected").val()},
dataType:'json',
success:function(response){
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option><option value="UC"'+(promote_id && 'UC' == promote_id?'selected':'')+'>UC渠道</option>';
str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>{:C("OFFICIEL_CHANNEL")}</option><option value="UC"'+(promote_id && 'UC' == promote_id?'selected':'')+'>UC渠道</option>';
// $.each(response.data, function(index, item){
// console.log(item.id);
// str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>';

@ -116,7 +116,7 @@
<td>
<switch name="data.promote_id">
<case value="-1">全站玩家</case>
<case value="0">官方渠道</case>
<case value="0">{:C('OFFICIEL_CHANNEL')}</case>
<case value="1">推广渠道</case>
</switch>
</td>

@ -96,7 +96,7 @@
<div class="input-list search_item input-list-gamenoticestatus">
<select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
<option value="">请选择推广员</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>官方渠道</option>
<option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>{:C('OFFICIEL_CHANNEL')}</option>
<option value="UC" <?php if ($_POST['promote_id'] == 'UC'):?>selected<?php endif;?>>UC用户</option>
</select>
</div>

@ -321,8 +321,8 @@ class PromoteService {
$toPromote = M('promote', 'tab_')->where(['id' => $toPromoteId])->find();
$fromPromote = M('promote', 'tab_')->where(['id' => $fromPromoteId])->find();
$toPromote = $toPromote ?? ['id' => 0, 'account' => '官方渠道'];
$fromPromote = $fromPromote ?? ['id' => 0, 'account' => '官方渠道'];
$toPromote = $toPromote ?? ['id' => 0, 'account' => C('OFFICIEL_CHANNEL')];
$fromPromote = $fromPromote ?? ['id' => 0, 'account' => C('OFFICIEL_CHANNEL')];
if ($fromPromote['id'] == 0 && count($shiftIds) == 0) {
@ -953,7 +953,7 @@ class PromoteService {
'bank_name' => $params['bank_name'] ?? '',
'bank_card' => $params['bank_card'],
'parent_id' => $parent ? $parent['id'] : 0,
'parent_name' => $parent ? $parent['account'] : '官方渠道',
'parent_name' => $parent ? $parent['account'] : C('OFFICIEL_CHANNEL'),
'admin_id' => $params['admin_id'] ?? 0,
'company_id' => $params['company_id'] ?? 0,
'invite_code' => $params['invite_code'] ?? '',

@ -1222,12 +1222,12 @@ function getGameSelleRatioByPromote($promoteId = null, $gameId = null)
*/
function get_promote_name($prmote_id=0){
if($prmote_id==0){
return "官方渠道";
return C('OFFICIEL_CHANNEL');
}
$promote = M("promote","tab_");
$map['id'] = $prmote_id;
$data = $promote->where($map)->find();
if(empty($data)){return "官方渠道";}
if(empty($data)){return C('OFFICIEL_CHANNEL');}
if(empty($data['account'])){return "未知推广";}
$result = $data['account'];
return $result;

@ -1753,3 +1753,13 @@ ADD COLUMN `old_change_promote_account` varchar(30) NULL COMMENT '修改配置
-- zyx 20200515
INSERT INTO `tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('juhedata', '聚合数据', '{\"tpl_id\":\"215303\",\"key\":\"1aa07a33b6d6408e835e416fafcd6f22\",\"limit\":\"\",\"status\":\"1\"}', NULL, 1, 1, 1589361782);
INSERT INTO `tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('juhe_age', '聚合身份认证', '{\"appkey\":\"80427f4769c6938f12a870f51014ddbe\",\"status\":\"1\"}', NULL, 1, 1, 1464164373);
ALTER TABLE `tab_forbit_ip`
ADD COLUMN `type` tinyint(2) NULL DEFAULT 0 COMMENT '类型 0美国ip白名单 1苹果第三方支付白名单 2 测试白名单' AFTER `remarks`;
ALTER TABLE `tab_forbit_ip`
ADD UNIQUE INDEX `userid_type`(`user_id`, `type`) COMMENT '用户id与类型唯一索引';
ALTER TABLE `tab_promote_company`
ADD COLUMN `develop_type` tinyint(2) NULL DEFAULT 0 COMMENT '1 自主开发 2 自主开发及维护 3 只维护' AFTER `company_belong`;
Loading…
Cancel
Save