diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php
index 0e6fe84f4..6531fbd53 100644
--- a/Application/Admin/Controller/GameController.class.php
+++ b/Application/Admin/Controller/GameController.class.php
@@ -771,8 +771,12 @@ class GameController extends ThinkController
if($data['data_id']==0 || $data['data_id']==""){ //查询初始分成比例信息
$initial_info = M('cp_game_ratio', 'tab_')->where("game_id=%d and begin_total_amount=0 and is_del=0",$data['game_id'])->find();
}
+ if(!is_numeric($data['game_ratio']) || $data['game_ratio']<0 || $data['game_ratio']>100){
+ die(json_encode(array("result"=>"0","desc"=>"分成比例为0~100之间")));
+ }
if($data['data_type']=='initial'){ //CP初始分成比例
+
if($data['data_id']>0){ //修改初始CP分成比例
$where = array();
$where['is_del'] = "0";
@@ -795,6 +799,10 @@ class GameController extends ThinkController
}
}
}else{ //CP阶梯分成档位
+ if(!is_numeric($data['total_amount']) || $data['total_amount']<=0){
+ die(json_encode(array("result"=>"0","desc"=>"流水金额应大于0")));
+ }
+
if($data['data_id']>0) { //修改阶梯分成
$where = array();
$where['game_id']= $data['game_id'];
diff --git a/Application/Admin/Controller/StatementController.class.php b/Application/Admin/Controller/StatementController.class.php
index 4219e588f..0dfa30d70 100644
--- a/Application/Admin/Controller/StatementController.class.php
+++ b/Application/Admin/Controller/StatementController.class.php
@@ -6,34 +6,22 @@ namespace Admin\Controller;
*/
class StatementController extends ThinkController
{
- public $mycompany = array(
- "id" => 0,
- "partner" => "海南万盟天下科技有限公司",
- "link_man" => "雷丽华",
- "link_phone" => "13067391751",
- "address" => "福建省福州市鼓楼区福大怡山创业园区11号103",
- "company_tax_no" => "1243245",
- "payee_name" => "雷丽华",
- "bank_account" => "1654654564364635456",
- "opening_bank" => "福州市福大分行"
- );
//创建
public function createCpStatement()
{
$this->display();
- //获取cp推广公司
-
}
//获取推广公司基础信息
public function getCpCompanyInfo()
{
$CompanyId = $_REQUEST['company_id'];
if($CompanyId == 0){
- $info = $this->mycompany;
+ $mycompany = M("tool","tab_")->field("config")->where("name='company_info'")->find();
+ $info = json_decode($mycompany['config'],true);
+ $info['id'] = 0;
}else{
$info = M("partner","tab_")->where("id = '{$CompanyId}'")->find();
}
-
if(empty($info)){
$this->ajaxReturn(array("error"=>"no find","code"=>2000));
}else{
@@ -60,6 +48,45 @@ class StatementController extends ThinkController
}
$map['pay_time'] = ['between', [strtotime($_REQUEST['time_start']), strtotime($_REQUEST['time_end']) + 86399]];
}
+ //判断是否有重叠时间
+ $Statement = M("statement","tab_");
+ $repart =false;
+ $errorstr = '';
+ //开始时间被重叠部分
+ $checkmap = array(
+ "statement_begin_time"=>array("ELT",strtotime($_REQUEST['time_start'])),
+ "statement_end_time"=>array("EGT",strtotime($_REQUEST['time_start'])),
+ "company_id"=>$CompanyId
+ );
+ $bres = $Statement->field("statement_begin_time,statement_end_time")->where($checkmap)->find();
+ if($bres){
+ $repart=true;
+ $begin = $_REQUEST['time_start'];
+ //统计相交时间
+ if(strtotime($_REQUEST['time_end']) > $bres["statement_end_time"]){
+ $end = date("Y-m-d",$bres["statement_end_time"]);
+ }else{
+ $end = $_REQUEST['time_end'];
+ }
+ $errorstr .= ($begin."到".$end."期间的数据已经结算过
");
+ }
+ //结束被重复的部分
+ $checkmap = array(
+ "statement_begin_time"=>array("ELT",strtotime($_REQUEST['time_end'])),
+ "statement_end_time"=>array("EGT",strtotime($_REQUEST['time_end'])),
+ "company_id"=>$CompanyId
+ );
+ $bres = $Statement->field("statement_begin_time,statement_end_time")->where($checkmap)->find();
+ if($bres){
+ $repart=true;
+ $begin = date("Y-m-d",$bres["statement_begin_time"]);
+ //统计相交时间
+ $end = $_REQUEST['time_end'];
+ $errorstr .= ($begin."到".$end."期间的数据已经结算过
");
+ }
+ if($repart){
+ $this->ajaxReturn(array("error"=>$errorstr,"code"=>2001));
+ }
//获取对应cp公司的游戏
$game_list = M("game","tab_")->field("id")->where("partner_id = '{$CompanyId}'")->select();
diff --git a/Application/Admin/View/Statement/createCpStatement.html b/Application/Admin/View/Statement/createCpStatement.html
index 64af44166..6dbc23016 100644
--- a/Application/Admin/View/Statement/createCpStatement.html
+++ b/Application/Admin/View/Statement/createCpStatement.html
@@ -513,11 +513,17 @@
}
var url = "{:U('getSpendStatement')}";
PUBLIC.postData(url,selectData,function(data){
- DATAOBJ.statement_begin_time = time_start;
- DATAOBJ.statement_end_time = time_end;
- DATAOBJ.statement_info = data.success;
- DATAOBJ.statement_count = data.count;
- TPLSHOW.showStatementList(true);
+ if(data.code > 0){
+ layer.alert(data.error);
+ return false;
+ }else{
+ DATAOBJ.statement_begin_time = time_start;
+ DATAOBJ.statement_end_time = time_end;
+ DATAOBJ.statement_info = data.success;
+ DATAOBJ.statement_count = data.count;
+ TPLSHOW.showStatementList(true);
+ }
+
})
diff --git a/Application/Admin/View/StatementMangement/lists.html b/Application/Admin/View/StatementMangement/lists.html
index 35e12c5ba..41331fdfb 100644
--- a/Application/Admin/View/StatementMangement/lists.html
+++ b/Application/Admin/View/StatementMangement/lists.html
@@ -130,7 +130,7 @@
{$data.statement_money} |
{$data.is_confirm} |
撤销
- 编辑 |
+ 编辑
@@ -214,10 +214,9 @@
});
});
- $("#statement_edit").click(function () {
+ $(".statement_edit").click(function () {
- var id = $(this).attr('edit-id');
- console.log(id)
+ var id = $(this).attr('ext_field');
layer.open({
type: 2,
@@ -225,7 +224,7 @@
shadeClose: true,
shade: 0.8,
area: ['70%', '80%'],
- content: ['/admin.php?s=/Member/role_list/' , 'no']
+ content: '/admin.php?s=/StatementMangement/editDownstreamOrder/ext_field/'+id
});
});