Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/finance_statement_three

master
chenzhi 5 years ago
commit 4a3cb6f6bb

@ -372,7 +372,16 @@ class CompanyStatementController extends ThinkController
public function delStatement(){
if(!isset($_REQUEST['ids'])) $this->error("参数错误");
$ids = $_REQUEST['ids'];
$dbres = $this->DBModel->where("id in ({$ids}) and verify_status = 0")->delete();
// $dbres = $this->DBModel->where("id in ({$ids}) and verify_status = 0")->delete();
$dbres = $this->DBModel->where("id in ({$ids})")->select();
foreach ($dbres as $key=>$value) {
if($value['withdraw_type'] !=3) {
$this->DBModel->where("id = {$value['id']} and verify_status = 0")->delete();
} else {
$this->DBModel->where("id = {$value['id']}")->delete();
}
}
addOperationLog(['op_type'=>2,'key'=>$ids,"op_name"=>"删除结算单",'url'=>U('lists')]);
$this->ajaxReturn(array(
'status' => 1,
@ -1385,14 +1394,16 @@ class CompanyStatementController extends ThinkController
$statement_data = [];
M()->startTrans();
foreach ($data as $key => $value) {
$begin_time = 99999999999;
$end_time = 0;
$statement_data = [];
$company_data = M("promote_company","tab_")->where(['id'=>$value['company_id']])->find();
$company_type = M("company_relation","tab_")->where("first_company_id={$value['company_id']} or second_company_id={$value['company_id']}")->find();
$insert['is_payment'] = $company_type['is_payment'];
$insert['statement_begin_time'] = strtotime($value['statement_begin_time']);
$insert['statement_end_time'] = strtotime($value['statement_end_time']);
// $insert['statement_begin_time'] = strtotime($value['statement_begin_time']);
// $insert['statement_end_time'] = strtotime($value['statement_end_time']);
$insert['withdraw_type'] = $withdraw_type;
$insert['company_belong'] = $company_data['company_belong'];
$insert['company_name'] = $company_data['company_name'];
@ -1487,12 +1498,23 @@ class CompanyStatementController extends ThinkController
$amount_time['pay_way'] = ['egt',0];
foreach ($statement_info as $k => $v) {
$statement_begin_time = strtotime(str_replace('.','-',$v['statement_begin_time']));
$statement_end_time = strtotime(str_replace('.','-',$v['statement_end_time']))+86399;
if ($statement_begin_time<$begin_time) {
$begin_time = $statement_begin_time;
}
if ($statement_end_time>$end_time) {
$end_time = $statement_end_time;
}
$amount_time['_string'] = "payed_time between {$statement_begin_time} and {$statement_end_time} and relation_game_id={$v['relation_game_id']}";
$dataAmount = M("spend","tab_")
->field("pay_amount,relation_game_id,relation_game_name,payed_time,game_type_name,substring_index(substring_index(promote.`chain`,'/',2),'/',-1) promote_id,chain,admin_id")
->field("pay_amount,relation_game_id,relation_game_name,payed_time,game_type_name,
CASE WHEN substring_index(substring_index(`chain`,'/',2),'/',-1) !='' THEN substring_index(substring_index(`chain`,'/',2),'/',-1) ELSE promote_id END promote_id,chain,admin_id")
->join("left join tab_promote promote on tab_spend.promote_id=promote.id")
->join("left join tab_game game on tab_spend.game_id=game.id")
->where($amount_time)
@ -1542,9 +1564,25 @@ class CompanyStatementController extends ThinkController
$insert['statement_info'] = json_encode($statement_insert);
} else {
$insert['statement_info'] = json_encode($statement_info);
foreach ($statement_info as $k => $v) {
$statement_begin_time = strtotime(str_replace('.','-',$v['statement_begin_time']));
$statement_end_time = strtotime(str_replace('.','-',$v['statement_end_time']))+86399;
if ($statement_begin_time<$begin_time) {
$begin_time = $statement_begin_time;
}
if ($statement_end_time>$end_time) {
$end_time = $statement_end_time;
}
}
}
$insert['statement_begin_time'] = $begin_time;
$insert['statement_end_time'] = $end_time;
if ($company_type['first_company_id'] == $value['company_id']) {
$insert['first_party_info'] = json_encode($proCompany_info);
$insert['second_party_info'] = json_encode($secord_info);

@ -785,7 +785,12 @@ class CompanyStatementPoolController extends ThinkController
if($re_op){
//公司及上游回退
if($db_res['company_type'] == 2){
$this->retry($db_res); //个人重算
if($db_res['withdraw_type'] == 3) {
$this->cancelCompanyPool($db_res);//公司撤回
} else {
$this->retry($db_res); //个人重算
}
}else{
$this->cancelCompanyPool($db_res);//公司撤回
}

@ -494,6 +494,10 @@
var flag = false;
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
if (id=="delStatement"&&$(elem).data("type")==3) {
return $(elem).val();
}
if($.inArray( $(elem).data("status"),status) == -1||(id=="updateStatement" && $(elem).data("type")==3)){
flag = true;
}else{

@ -236,13 +236,15 @@
format: 'yyyy-mm-dd',
language:"zh-CN",
minView:2,
autoclose:true
autoclose:true,
endDate : new Date()
});
$('#time_end').datetimepicker({
format: 'yyyy-mm-dd',
language:"zh-CN",
minView:2,
autoclose:true
autoclose:true,
endDate : new Date()
});
$('#datetimepicker').datetimepicker({
@ -533,10 +535,10 @@
}
$('#tablebox').find('tbody').prepend(html);
complementChange();
DeleteTd();
caculateAmount();
}
} else {
@ -572,6 +574,8 @@
$('.complement').change(function() {
//获取总流水
var pay_amount = parseFloat($(this).parent().prev().prev().text());
var show_ratio = $(this).parent().prev().text();
show_ratio = parseFloat(show_ratio.slice(0,show_ratio.length-1));
//计算最终分配比率
var ratio = parseFloat($(this).val());
@ -580,10 +584,14 @@
$(this).val(0);
ratio = 0;
}
if (ratio>100) {
$(this).val(100);
ratio = 100;
if(!ratio) {
$(this).val(0);
ratio=0;
}
// console.log(ratio+show_ratio);
if ((ratio+show_ratio)>100) {
$(this).val(100-show_ratio);
ratio = 100-show_ratio;
}
//最终的分配金额
var withdraw_amount = ((pay_amount * ratio)/100).toFixed(2);
@ -592,6 +600,7 @@
caculateAmount();
});
}
//删除操作
function DeleteTd() {

@ -421,10 +421,10 @@
<td class="r table_radio">
<span class="form_radio table_btn">
<label>
<input type="radio" value="1" name="relation[is_payment]" checked="checked">
<input type="radio" value="1" name="relation[is_payment]" <?php if($relation['is_payment'] == 1):?>checked<?php endif;?>>
</label>
<label>
<input type="radio" value="2" name="relation[is_payment]">
<input type="radio" value="2" name="relation[is_payment]" <?php if($relation['is_payment'] == 2):?>checked<?php endif;?>>
</label>
</span>
<span class="notice-text">选择否将不能进行线上打款</span>

Loading…
Cancel
Save