elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'hotfix/company_bug' (#70) from hotfix/company_bug into release

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/70
master
廖金灵 4 years ago
parent 55fc77e3ec 09076be22b
commit 7e5b3cfe7f
15 changed files with 106 additions and 69 deletions
Show Stats Download Patch File Download Diff File

3
Application/Admin/Conf/config.php
Unescape Escape View File

@ -127,6 +127,7 @@ return array(
"tab_settleup_marketorder",
"tab_market_altogether",
"tab_cmd_tasks",
"tab_operation_log"
"tab_operation_log",
"sys_action_log"
]
);

17
Application/Admin/Controller/CompanyStatementSetController.class.php
Unescape Escape View File

@ -84,9 +84,11 @@ class CompanyStatementSetController extends Controller {
$this->promoteCompanyStatement(0,$stime);
echo "∟----推广公司周结统计ok".PHP_EOL;
$this->promoteUserPool(0,$stime);
echo "∟----推广个人周结ok".PHP_EOL;
if(!IS_SUBSITE){
$this->promoteUserPool(0,$stime);
echo "∟----推广个人周结ok".PHP_EOL;
}
}
if($company == "cp"){
$this->cpStatement(0,$stime);
@ -115,10 +117,11 @@ class CompanyStatementSetController extends Controller {
$this->promoteCompanyStatement(2,$stime);
$this->officeCompanyStatement($stime); //官方结算
echo "∟----官方/推广公司月结&补点统计ok".PHP_EOL;
$this->promoteUserPool(1,$stime);
$this->promoteUserPool(2,$stime);
echo "∟----推广个人月结&补点统计ok".PHP_EOL;
if(!IS_SUBSITE){
$this->promoteUserPool(1,$stime);
$this->promoteUserPool(2,$stime);
echo "∟----推广个人月结&补点统计ok".PHP_EOL;
}
}
if($company == "cp"){
$this->cpStatement(1,$stime);

11
Application/Admin/Controller/PartnerController.class.php
Unescape Escape View File

@ -280,6 +280,8 @@ class PartnerController extends ThinkController
// $count = $model
// ->where($map)
// ->count();
$arraypage = $page;
//分页
$parameter['p'] = $page;
$parameter['row'] = $row;
@ -288,7 +290,7 @@ class PartnerController extends ThinkController
$this->assign('_page', $page);
}
$arraypage = $page;
// $arraypage = $page;
$size = $row;//每页显示的记录数
$parseData = array_slice($parseData, ($arraypage - 1) * $size, $size);
// $page = set_pagination($count, $row, $parameter);
@ -473,7 +475,12 @@ class PartnerController extends ThinkController
if ($_POST) {
$save = I("post.");
$this->checkData($save);
$save['relation']['collaborate_way'] = $save['part_a_type'];
if ($save['part_a_type'] == 1) { // 1己方公司的时候 合作类型是2
$save['relation']['collaborate_way'] = 2;
}
if ($save['part_a_type'] == 2) { // 2下游推广公司的时候 合作类型是1
$save['relation']['collaborate_way'] = 1;
}
if ($save['part_a_type'] == 1) {
$save['relation']['self_company_id'] = $save['part_a'];
}

11
Application/Admin/Controller/PromoteCompanyController.class.php
Unescape Escape View File

@ -732,11 +732,16 @@ class PromoteCompanyController extends ThinkController
if ($_POST) {
$save = I('post.');//前端已经验证
$save['relation']['collaborate_way'] = $save['part_a_type'];
if ($save['part_a_type'] == 1) {
if ($save['part_a_type'] == 1) { // 1己方公司的时候 合作类型是2
$save['relation']['collaborate_way'] = 2;
}
if ($save['part_a_type'] == 2) { // 2下游推广公司的时候 合作类型是1
$save['relation']['collaborate_way'] = 1;
}
if ($save['part_a_type'] == 1) { // 1己方公司的时候
$save['relation']['self_company_id'] = $save['part_a'];
}
if ($save['part_a_type'] == 2) {
if ($save['part_a_type'] == 2) { // 2下游推广公司的时候
$save['relation']['self_company_id'] = $save['part_b'];
}

9
Application/Admin/Controller/PublicController.class.php
Unescape Escape View File

@ -24,6 +24,10 @@ class PublicController extends \Think\Controller
if (!check_verify($verify)) {
$this->error('验证码输入错误！');
}
/* 财务账号只能登陆子系统*/
if(!IS_SUBSITE && $username == "cw"){
$this->error('账户或密码错误！');
}
/* 调用UC登录接口登录 */
$User = new UserApi;
@ -101,7 +105,10 @@ class PublicController extends \Think\Controller
'last_login_time' => NOW_TIME,
'last_login_ip' => get_client_ip(1),
);
$Member->save($data);
if(!IS_SUBSITE){
$Member->save($data);
}
$adminData = getAdminData($member['uid']);
$groupId = getGameGroup($member['uid']);

4
Application/Admin/Model/MemberModel.class.php
Unescape Escape View File

@ -69,7 +69,9 @@ class MemberModel extends Model {
'last_login_time' => NOW_TIME,
'last_login_ip' => get_client_ip(1),
);
$this->save($data);
if(!IS_SUBSITE){
$this->save($data);
}
$adminData = getAdminData($user['uid']);
$groupId = getGameGroup($user['uid']);

18
Application/Admin/View/Deposit/lists.html
Unescape Escape View File

@ -83,14 +83,16 @@
<option value="0">下单未付款</option>
</select>
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
<if condition="!IS_SUBSITE">
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
</if>
<!-- <div class="input-list search_item input-list-gamenoticestatus">-->
<!-- <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">-->
<!-- <option value="">请选择推广员等级</option>-->

12
Application/Admin/View/Partner/edit.html
Unescape Escape View File

@ -152,16 +152,16 @@
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="l" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery">
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery">
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
@ -179,7 +179,7 @@
<span class="notice-text"></span>
</td>
</tr>-->
<?php if($relation['collaborate_way'] == 1):?>
<?php if($relation['collaborate_way'] == 2):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="l" style="width: 50px;">
@ -200,7 +200,7 @@
</td>
</tr>
<?php endif;?>
<?php if($relation['collaborate_way'] == 2):?>
<?php if($relation['collaborate_way'] == 1):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="l" style="width: 50px;">

12
Application/Admin/View/Partner/show.html
Unescape Escape View File

@ -149,16 +149,16 @@
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="l" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery" disabled>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery" disabled>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
@ -176,7 +176,7 @@
<span class="notice-text"></span>
</td>
</tr>-->
<?php if($relation['collaborate_way'] == 1):?>
<?php if($relation['collaborate_way'] == 2):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="l" style="width: 50px;">
@ -196,7 +196,7 @@
</td>
</tr>
<?php endif;?>
<?php if($relation['collaborate_way'] == 2):?>
<?php if($relation['collaborate_way'] == 1):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="l" style="width: 50px;">

12
Application/Admin/View/PromoteCompany/edit.html
Unescape Escape View File

@ -500,16 +500,16 @@
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="r" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery">
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery" >
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
@ -528,7 +528,7 @@
</td>
</tr>-->
<?php if($relation['collaborate_way'] == 1):?>
<?php if($relation['collaborate_way'] == 2):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="r" style="width: 50px;">
@ -549,7 +549,7 @@
</tr>
<?php endif;?>
<?php if($relation['collaborate_way'] == 2):?>
<?php if($relation['collaborate_way'] == 1):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="r" style="width: 50px;">

12
Application/Admin/View/PromoteCompany/view.html
Unescape Escape View File

@ -486,16 +486,16 @@
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="r" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery" disabled>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery" disabled>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
@ -513,7 +513,7 @@
<span class="notice-text"></span>
</td>
</tr>-->
<?php if($relation['collaborate_way'] == 1):?>
<?php if($relation['collaborate_way'] == 2):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="r" style="width: 50px;">
@ -533,7 +533,7 @@
</td>
</tr>
<?php endif;?>
<?php if($relation['collaborate_way'] == 2):?>
<?php if($relation['collaborate_way'] == 1):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="r" style="width: 50px;">

19
Application/Admin/View/Spend/lists.html
Unescape Escape View File

@ -178,14 +178,17 @@
<option value="2">聚合平台</option>
</select>
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
<if condition="!IS_SUBSITE">
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
</if>
<div class="input-list search_item input-list-gamenoticestatus">
<select id="is_check" name="is_check" class="select_gallery">

26
Application/Admin/View/TestOrder/lists.html
Unescape Escape View File

@ -93,14 +93,16 @@
<option value="17" <if condition="$_GET['pay_way'] eq '17'">selected</if>>易宝支付</option>
</select>
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
<if condition="!IS_SUBSITE">
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
</if>
<div class="input-list input-list-server search_label_rehab">
<select id="platform_type" name="platform_type" class="select_gallery" style="width:120px;">
<option value="0">所属平台</option>
@ -116,9 +118,11 @@
array_merge(array('xlsname'=>'测试游戏订单查看导出'),I('get.')))}">导出</a>
</if>-->
</div>
<div class="input-list">
<a class="sch-btn" href="javascript:;" id="upstream" style="width: 80px">订单录入</a>
</div>
<if condition="!IS_SUBSITE">
<div class="input-list">
<a class="sch-btn" href="javascript:;" id="upstream" style="width: 80px">订单录入</a>
</div>
</if>
</div>
</div>

4
Application/Common/Common/function.php
Unescape Escape View File

@ -697,9 +697,9 @@ function action_log($action = null, $model = null, $record_id = null, $user_id =
$data['remark'] = '操作url：' . $_SERVER['REQUEST_URI'];
}
M('ActionLog')->add($data);
SM('ActionLog',"sys_")->add($data);
if (!empty($action_info['rule'])) {
if (!empty($action_info['rule']) && !IS_SUBSITE) {
//解析行为
$rules = parse_action($action, $user_id);

5
Application/Home/Model/MemberModel.class.php
Unescape Escape View File

@ -79,7 +79,10 @@ class MemberModel extends Model{
'last_login_time' => NOW_TIME,
'last_login_ip' => get_client_ip(1),
);
$this->save($data);
if(!IS_SUBSITE){
$this->save($data);
}
/* 记录登录SESSION和COOKIES */
$auth = array(

Write Preview
Loading…
Cancel
Save