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

解决冲突

Browse Source
master
ELF 5 years ago
parent 423b4ae77b 02bf27fd5d
commit c95f771ba0
12 changed files with 283 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -85,10 +85,45 @@ class PromoteCompanyController extends ThinkController
if (empty($company_name)) {
$this->error('请输入推广公司名称');
}
if (empty(I('post.settlement_contact'))) {
$this->error('请输入结算联系人');
}
if (empty(I('post.contact_phone'))) {
$this->error('请输入联系人电话');
}
$pattern = "/^1[3|5|7|8]\\d{9}$/i";
if(!preg_match($pattern, I('post.contact_phone'))) {
$this->error("手机号码格式不合法");
return false;
}
if (empty(I('post.address'))) {
$this->error('请输入所在地址');
}
if (empty(I('post.bank_card'))) {
$this->error('请输入银行卡号');
}
$bank_card_pattern = "/^\d{10,19}$/u";
if (!preg_match($bank_card_pattern, I('post.bank_card'))) {
$this->error('卡号格式错误');
return false;
}
if (empty(I('post.bank_cardname'))) {
$this->error('请输入银行卡名');
}
if (empty(I('post.bank_name'))) {
$this->error('请输入收款银行');
}
if (empty(I('post.bank_address'))) {
$this->error('请输入开户网点');
}
if (!in_array($status, [0, 1])) {
$this->error('参数异常');
}
if (!empty(I('post.content'))) {
$save['content'] = I('post.content');
}
$model = M($this->modelName, 'tab_');
$map['company_name'] = $company_name;
$res = $model->where($map)->getField('id');
@ -102,6 +137,13 @@ class PromoteCompanyController extends ThinkController
$save['uid'] = UID;
$save['create_time'] = $time;
$save['last_up_time'] = $time;
$save['settlement_contact'] = I('post.settlement_contact');
$save['contact_phone'] = I('post.contact_phone');
$save['address'] = I('post.address');
$save['bank_card'] = I('post.bank_card');
$save['bank_cardname'] = I('post.bank_cardname');
$save['bank_name'] = I('post.bank_name');
$save['bank_address'] = I('post.bank_address');
$res = $model->add($save);
if ($res) {
@ -130,10 +172,43 @@ class PromoteCompanyController extends ThinkController
if (empty($company_name)) {
$this->error('请输入推广公司名称');
}
if (empty(I('post.settlement_contact'))) {
$this->error('请输入结算联系人');
}
if (empty(I('post.contact_phone'))) {
$this->error('请输入联系人电话');
}
$pattern = "/^1[3|5|7|8]\\d{9}$/i";
if(!preg_match($pattern, I('post.contact_phone'))) {
$this->error("手机号码格式不合法");
return false;
}
if (empty(I('post.address'))) {
$this->error('请输入所在地址');
}
if (empty(I('post.bank_card'))) {
$this->error('请输入银行卡号');
}
$bank_card_pattern = "/^\d{10,19}$/u";
if (!preg_match($bank_card_pattern, I('post.bank_card'))) {
$this->error('卡号格式错误');
return false;
}
if (empty(I('post.bank_cardname'))) {
$this->error('请输入银行卡名');
}
if (empty(I('post.bank_name'))) {
$this->error('请输入收款银行');
}
if (empty(I('post.bank_address'))) {
$this->error('请输入开户网点');
}
if (!in_array($status, [0, 1]) || $id == 0) {
$this->error('参数异常');
}
if (!empty(I('post.content'))) {
$save['content'] = I('post.content');
}
$data = $model->field('id,company_name')->find($id);
if (empty($data)) {
$this->error('数据异常');
@ -150,6 +225,13 @@ class PromoteCompanyController extends ThinkController
$save['company_name'] = $company_name;
$save['status'] = $status;
$save['last_up_time'] = $time;
$save['settlement_contact'] = I('post.settlement_contact');
$save['contact_phone'] = I('post.contact_phone');
$save['address'] = I('post.address');
$save['bank_card'] = I('post.bank_card');
$save['bank_cardname'] = I('post.bank_cardname');
$save['bank_name'] = I('post.bank_name');
$save['bank_address'] = I('post.bank_address');
$res = $model->save($save);
if ($res === false) {
@ -161,7 +243,7 @@ class PromoteCompanyController extends ThinkController
} else {
$id = intval(I('get.id', 0));
$map['id'] = $id;
$data = $model->field('id,company_name,status')->find($id);
$data = $model->field('id,company_name,status,settlement_contact,contact_phone,address,bank_card,bank_cardname,bank_name,bank_address,content')->find($id);
if (empty($data)) {
$this->error('数据异常', U('lists'));
}

18
Application/Admin/Controller/PromoteGameRatioController.class.php
Unescape Escape View File

@ -116,14 +116,23 @@ class PromoteGameRatioController extends ThinkController
$thisTurnoverRatios = $promoteGameRatio['turnover_ratio'] ? json_decode($promoteGameRatio['turnover_ratio'], true) : [];
$thisRatioDtl = "默认：{$promoteGameRatio['ratio']}%";
if ($thisTurnoverRatios) {
if (I('export', 0) == 1) {
$symbol = "\n";
} else {
$symbol = "<br>";
}
foreach ($thisTurnoverRatios as $thisTurnoverRatio) {
$thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥';
$thisRatioDtl .= "<br>月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%";
$thisRatioDtl .= "{$symbol}月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%";
}
}
$thisLastRatioStatus = $promoteGameRatio['last_ratio_status'];
$thisStatusText = self::$statusList[$promoteGameRatio['status']];
$thisStatusText = ($promoteGameRatio['status'] == -1) ? '<span style="color: red;">' . $thisStatusText . '</span>' : $thisStatusText;
if (I('export', 0) == 1) {
$thisStatusText = ($promoteGameRatio['status'] == -1) ? $thisStatusText : $thisStatusText;
} else {
$thisStatusText = ($promoteGameRatio['status'] == -1) ? '<span style="color: red;">' . $thisStatusText . '</span>' : $thisStatusText;
}
$thisApplicant = get_admin_account($promoteGameRatio['applicant_id']);
$thisReviewer = $promoteGameRatio['reviewer_id'] ? get_admin_account($promoteGameRatio['reviewer_id']) : '待确认';
$thisBeninTime = date('Y/m', $promoteGameRatio['begin_time']);
@ -181,9 +190,12 @@ class PromoteGameRatioController extends ThinkController
'promote_create_time' => '注册时间',
'promote_status_text' => '状态',
'promote_ver_status_text' => '身份状态',
'company_name' => '推广公司',
'company_belong' => '工会归属',
'game_name' => '已申请游戏',
'game_type_name' => '游戏类型',
'last_ratio' => '原分成比例',
'ratio' => '当前分成比例',
'ratio_dtl' => '公会阶梯比例详细信息',
'valid_date' => '开始时间',
'remark' => '备注',
'status_text' => '分成比例审核',

37
Application/Admin/Controller/QueryController.class.php
Unescape Escape View File

@ -1593,27 +1593,24 @@ class QueryController extends ThinkController
$promoteInfo = M('promote','tab_')->where(['id'=>$promote_id])->find();
$level = $promoteInfo['level'];
if($promote_id != 0) {
$promoteIdArr = [];
if ($level == 1) {
$rootPromoteId = $promote_id;
$where['promote_id'] = $promote_id;
$promoteIdArr[] = $promote_id;
}else {
$chain = $promoteInfo['chain'];
$chainArr = explode('/',$chain);
$rootPromoteId = $chainArr[1];
$where1['chain'] = array('like', '%/' . $rootPromoteId. '/%');
$promoteIdInfo = M('promote','tab_')->field('id')->where($where1)->select();
$promoteIdArr = [];
foreach($promoteIdInfo as $key2 => $v1) {
$promoteIdArr[] = $v1['id'];
}
$where['promote_id'] = ['in',$promoteIdArr];
}
$where1['chain'] = array('like', '%/' . $rootPromoteId. '/%');
$promoteIdInfo = M('promote','tab_')->field('id')->where($where1)->select();
foreach($promoteIdInfo as $key2 => $v1) {
$promoteIdArr[] = $v1['id'];
}
$where['promote_id'] = ['in',$promoteIdArr];
}else {
$where['promote_id'] = 0;
}
$where['game_id'] = ['in',$gameNameIdArr];
$where['pay_status'] = 1;
$begTime = strtotime($mytime);
@ -1911,25 +1908,25 @@ class QueryController extends ThinkController
$promoteInfo = M('promote','tab_')->where(['id'=>$promote_id])->find();
$level = $promoteInfo['level'];
if($promote_id != 0) {
$promoteIdArr = [];
if ($level == 1) {
$rootPromoteId = $promote_id;
$map['promote_id'] = $promote_id;
$promoteIdArr[] = $promote_id;
}else {
$chain = $promoteInfo['chain'];
$chainArr = explode('/',$chain);
$rootPromoteId = $chainArr[1];
$where1['chain'] = array('like', '%/' . $rootPromoteId. '/%');
$promoteIdInfo = M('promote','tab_')->field('id')->where($where1)->select();
$promoteIdArr = [];
foreach($promoteIdInfo as $key2 => $v1) {
$promoteIdArr[] = $v1['id'];
}
$map['promote_id'] = ['in',$promoteIdArr];
}
$where1['chain'] = array('like', '%/' . $rootPromoteId. '/%');
$promoteIdInfo = M('promote','tab_')->field('id')->where($where1)->select();
foreach($promoteIdInfo as $key2 => $v1) {
$promoteIdArr[] = $v1['id'];
}
$map['promote_id'] = ['in',$promoteIdArr];
}else {
$map['promote_id'] = 0;
}
var_dump($level);
$pay_status = 1;
$map['game_id'] = ['in',$gameNameIdArr];
// $map['promote_id'] = ['in',$promoteIdArr];

3
Application/Admin/Controller/StatementMangementController.class.php
Unescape Escape View File

@ -242,6 +242,9 @@ class StatementMangementController extends ThinkController
if (!empty(I('partner_id'))) {
$map['company_id'] = I('partner_id');
}
if (strlen(I('company_type'))) {
$map['company_type'] = I('company_type');
}
if (!empty(I('account'))) {
$map['accounts'] = ['like', '%' . I('account') . '%'];
}

48
Application/Admin/View/PromoteCompany/add.html
Unescape Escape View File

@ -35,6 +35,54 @@
<input type="text" class="txt " name="company_name" value="" placeholder="请输入推广公司名称">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系结算人：</td>
<td class="r" >
<input type="text" class="txt " name="settlement_contact" value="" placeholder="请输入结算联系人">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系电话：</td>
<td class="r" >
<input type="text" class="txt " name="contact_phone" value="" placeholder="请输入联系电话">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>所在地址：</td>
<td class="r" >
<input type="text" class="txt " name="address" value="" placeholder="请输入所在地址">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>银行卡号：</td>
<td class="r" >
<input type="text" class="txt " name="bank_card" value="" placeholder="请输入银行卡号">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>银行卡名：</td>
<td class="r" >
<input type="text" class="txt " name="bank_cardname" value="" placeholder="请输入银行卡名">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>收款银行：</td>
<td class="r" >
<input type="text" class="txt " name="bank_name" value="" placeholder="请输入收款银行">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>开户网点：</td>
<td class="r" >
<input type="text" class="txt " name="bank_address" value="" placeholder="请输入开户网点">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px"></i>备注：</td>
<td class="r" >
<input type="text" class="txt " name="content" value="" placeholder="">
</td>
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>显示状态：</td>
<td class="r table_radio">

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

@ -35,6 +35,54 @@
<input type="text" class="txt " name="company_name" value="{$data.company_name}" placeholder="请输入推广公司名称">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系结算人：</td>
<td class="r" >
<input type="text" class="txt " name="settlement_contact" value="{$data.settlement_contact}" placeholder="请输入结算联系人">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系电话：</td>
<td class="r" >
<input type="text" class="txt " name="contact_phone" value="{$data.contact_phone}" placeholder="请输入联系电话">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>所在地址：</td>
<td class="r" >
<input type="text" class="txt " name="address" value="{$data.address}" placeholder="请输入所在地址">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>银行卡号：</td>
<td class="r" >
<input type="text" class="txt " name="bank_card" value="{$data.bank_card}" placeholder="请输入银行卡号">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>银行卡名：</td>
<td class="r" >
<input type="text" class="txt " name="bank_cardname" value="{$data.bank_cardname}" placeholder="请输入银行卡名">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>收款银行：</td>
<td class="r" >
<input type="text" class="txt " name="bank_name" value="{$data.bank_name}" placeholder="请输入收款银行">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>开户网点：</td>
<td class="r" >
<input type="text" class="txt " name="bank_address" value="{$data.bank_address}" placeholder="请输入开户网点">
</td>
</tr>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px"></i>备注：</td>
<td class="r" >
<input type="text" class="txt " name="content" value="{$data.content}" placeholder="">
</td>
</tr>
<tr>
<td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>显示状态：</td>
<td class="r table_radio">

10
Application/Admin/View/StatementMangement/rewardManageList.html
Unescape Escape View File

@ -64,7 +64,15 @@
<!-- 高级搜索 -->
<div class="jssearch fl cf search_list">
<!--游戏类型搜索END-->
<!--公司类型搜索END-->
<div class="input-list input-list-server search_label_rehab">
<select id="company_type" name="company_type" class="select_gallery" style="width:120px;">
<option value="">请选择公司类型</option>
<option value="1" <if condition="'0' eq $_GET['company_type']">selected=selected</if>>上游公司</option>
<option value="2" <if condition="'1' eq $_GET['company_type']">selected=selected</if>>下游公司</option>
</select>
</div>
<!--合作公司搜索END-->
<div class="input-list input-list-server search_label_rehab">
<select id="partner_id" name="partner_id" class="select_gallery" style="width:120px;">
<option value="">请选择合作公司</option>

8
Application/Home/Controller/PromoteController.class.php
Unescape Escape View File

@ -239,10 +239,10 @@ class PromoteController extends BaseController
$weekArray = [7,1,2,3,4,5,6];
$week = $weekArray[date("w")];
$match_rules = M("document_pop_rules")
->field('id')
->where("(type = 1 and pop_time = {$currentTime}) or (type = 2 and pop_time = {$week})")
->order("sort asc, id desc")
->select();
->field('id')
->where("(type = 1 and pop_time = {$currentTime}) or (type = 2 and pop_time = {$week})")
->order("sort asc, id desc")
->select();
} else {
$match_rules = [];
}

21
Application/Home/Controller/SafeController.class.php
Unescape Escape View File

@ -459,14 +459,33 @@ class SafeController extends BaseController{
}
public function safeDocument() {
$realname = $_REQUEST['realname'];
$phone = $_REQUEST['phone'];
$email = $_REQUEST['email'];
$address = $_REQUEST['address'];
if (empty($realname)) {
$realname = '您未填写真实姓名';
}
if (empty($email)) {
$email = '您未填写联系邮箱';
}
if (empty($address)) {
$address = '您未填写注册地址';
}
if (empty($phone)) {
$phone = '您未填写联系号码';
}
$time = time();
$loginPromote = $this->getLoginPromote();
$sn = date('Ymd') . '-' . strtoupper(substr(md5($loginPromote['id']), 8, 16));
$endTime = date('Y-m-d',strtotime('+1 year'));
$this->assign('time',date('Y-m-d',$time));
$this->assign('endTime',$endTime);
$this->assign('sn',$sn);
$this->assign('realname',$realname);
$this->assign('email',$email);
$this->assign('address',$address);
$this->assign('phone',$phone);
$this->display();
}
}

19
Application/Home/View/default/Safe/modifyBaseInfo.html
Unescape Escape View File

@ -304,7 +304,8 @@
<tr>
<td class="l"></td>
<td class="r"><input type="checkbox" class="input txt" id="agree" style="margin-left:20px" name="agree" >我已仔细阅读，并同意<a href="{:U('safe/safeDocument',array('username'=>$promoteinfo['account']))}"><span style="color:#26c7dbd4" id="read">《游戏推广服务框架协议》</span></a>
<!-- <td class="r"><input type="checkbox" class="input txt" id="agree" style="margin-left:20px" name="agree" >我已仔细阅读，并同意<a href="{:U('safe/safeDocument',array('username'=>$promoteinfo['account'],'email'=>$promoteinfo['email'],'realname'=>$promoteinfo['real_name'],'phone'=>$promoteinfo['mobile_phone'],'address'=>$promoteinfo['address']))}"><span style="color:#26c7dbd4" id="read">《游戏推广服务框架协议》</span></a> -->
<td class="r"><input type="checkbox" class="input txt" id="agree" style="margin-left:20px" name="agree" >我已仔细阅读，并同意<span style="color:#26c7dbd4" id="read" onclick="read_detail('{$promoteinfo.account}','{$promoteinfo.email}','{$promoteinfo.real_name}','{$promoteinfo.mobile_phone}','{$addr}')">《游戏推广服务框架协议》</span>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
@ -329,6 +330,22 @@
</block>
<block name="script">
<script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
<script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js"></script>
<script>
function read_detail(username,email,realname,phone,address) {
console.log('xx')
console.log(address)
layer.open({
type: 2,
title: "游戏推广服务框架协议",
shadeClose: true,
shade: 0.8,
area: ['70%', '82%'],
content: ['index.php?s=/Home/safe/safeDocument/username/'+ username +'/email/' + email + '/realname/' + realname + '/phone/' + phone +'/address/' + address + '', 'no']
});
}
</script>
<script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
<script type="text/javascript" src="__STATIC__/mail_suffix.js"></script>
<script type="text/javascript" src="__STATIC__/bank.js"></script>

12
Application/Home/View/default/Safe/safeDocument.html
Unescape Escape View File

@ -47,7 +47,7 @@ and open the template in the editor.
</style>
<body>
<div class="docContain">
<div class="docContain" style="overflow:scroll; width:800px; height:800px;">
<div class="title"><h2>游戏推广服务框架协议</h1></div>
<div class="text">
<p>本协议由以下双方于<span>{$time}</span>签订:</p>
@ -57,11 +57,11 @@ and open the template in the editor.
<p>联系电话：13067391751</p>
<p>联系人：雷丽华</p>
<p>邮箱号：383166987@qq.com</p>
<p>乙方：</p>
<p>注册地址：</p>
<p>联系电话：</p>
<p>联系人：</p>
<p>邮箱号：</p>
<p>乙方：{$realname}</p>
<p>注册地址：{$address}</p>
<p>联系电话：{$phone}</p>
<p>联系人：{$realname}</p>
<p>邮箱号：{$email}</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;经甲乙双方协商一致，在平等互利的基础上，就乙方推广甲方拥有知识产权
或合法授权的游戏（以下简称“产品”）达成如下协议：</p>
<p style="font-weight: bold">1 合作内容及合作期限</p>

11
Data/update.sql
Unescape Escape View File

@ -1195,3 +1195,14 @@ ADD COLUMN `review_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '审核模式：1
-- 2020-02-10 liaojinling 推广员组名/部门名
ALTER TABLE `tab_promote`
ADD COLUMN `group_remark` varchar(50) NOT NULL default '' COMMENT '部门分组';
--2020-02-10 sunke 公司录入主体信息增加--
ALTER TABLE `tab_promote_company`
ADD COLUMN `settlement_contact` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '结算联系人' AFTER `last_up_time`,
ADD COLUMN `contact_phone` BIGINT(12) NOT NULL DEFAULT '0' COMMENT '联系电话' AFTER `settlement_contact`,
ADD COLUMN `address` VARCHAR(255) NOT NULL DEFAULT '0' COMMENT '所在地址' AFTER `contact_phone`,
ADD COLUMN `bank_card` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '银行卡号' AFTER `address`,
ADD COLUMN `bank_cardname` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '银行卡名' AFTER `bank_card`,
ADD COLUMN `bank_name` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '收款银行' AFTER `bank_cardname`,
ADD COLUMN `bank_address` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '开户网点' AFTER `bank_name`,
ADD COLUMN `content` VARCHAR(255) NULL DEFAULT '' COMMENT '备注' AFTER `bank_address`;

Write Preview
Loading…
Cancel
Save