编辑扣款旧的验证添加

master
zhengyongxing 4 years ago
parent baca13a95e
commit 2758c608ad

@ -162,11 +162,19 @@ class ExcelPaymentController extends BaseController
$company_info = $v['company_info'];
// $v['statement_begin_time'] = $statement_begin_time;
// $v['statement_end_time'] = $statement_end_time;
$statement_time = explode('-',$v['statement_info'][0]['game_list'][0]['statement_time']);
$v['batch_num'] = $batch;
$v['statement_info'] = json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE);
$v['company_info'] = json_encode($v['company_info'],JSON_UNESCAPED_UNICODE);
$v['company_type'] = 2;
$v['create_time'] = time();
$v['statement_begin_time'] = strtotime(str_replace('.','-',$statement_time[0]));
$v['statement_end_time'] = strtotime(str_replace('.','-',$statement_time[1]));
$v['statement_num'] = "JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5);
$dm = [
"mobile"=>$this->admininfo['mobile'],
@ -464,4 +472,63 @@ class ExcelPaymentController extends BaseController
}
/**
* 验证订单
*/
public function checkOrder() {
if(!$_REQUEST['ids']) {
$this->ajaxReturn(['data'=>[]]);
}
$ids = $_REQUEST['ids'];
$data = M("excel_statement_info","tab_")
->field("id,statement_money,company_name,statement_begin_time,statement_end_time,pay_time")
->where(['id'=>['in',$ids]])
->select();
$return = [];
foreach ($data as $key => $value) {
$check_data = M("excel_statement_info","tab_")
->where([
'statement_money'=>$value['statement_money'],
'company_name'=>$value['company_name'],
'statement_begin_time'=>$value['statement_begin_time'],
'statement_end_time'=>$value['statement_end_time'],
// 'id'=>['neq',$value['id']],
'pay_status'=>1
])
->select();
$check_company_statement_info = M("company_statement_info","tab_")
->where([
'pay_status'=>1,
'company_name'=>$value['company_name'],
'statement_begin_time'=>$value['statement_begin_time'],
'statement_end_time'=>$value['statement_end_time'],
'statement_money'=>$value['statement_money'],
])
->select();
$return = array_merge($return,$check_data,$check_company_statement_info);
}
foreach ($return as $key => $value) {
$return[$key]['time'] = ($value['statement_begin_time']?date("Y-m-d",$value['statement_begin_time']):'无').'-'.($value['statement_end_time']?date("Y-m-d",$value['statement_end_time']):'无');
$return[$key]['pay_time'] = date("Y-m-d H:m:s",$value['pay_time']);
}
$this->ajaxReturn(['data'=>$return]);
}
}

@ -65,6 +65,14 @@ class PaymentController extends BaseController
$map['i.pay_time'] = ['ELT', strtotime($_REQUEST['pay_time_end']) + 86399];
}
if (isset($_REQUEST['verifytime_start']) && isset($_REQUEST['verifytime_end'])) {
$map['i.verify_time'] = ['between', [strtotime($_REQUEST['verifytime_start']), strtotime($_REQUEST['verifytime_end']) + 86399]];
} elseif (isset($_REQUEST['verifytime_start'])) {
$map['i.verify_time'] = ['EGT', strtotime($_REQUEST['verifytime_start'])];
} elseif (isset($_REQUEST['verifytime_end'])) {
$map['i.verify_time'] = ['ELT', strtotime($_REQUEST['verifytime_end']) + 86399];
}
if(isset($_REQUEST['company_type'])){
$map['i.company_type'] = $_REQUEST['company_type'];
}
@ -84,7 +92,7 @@ class PaymentController extends BaseController
$map['i.pay_type'] = $_REQUEST['pay_type'];
}
// dump($map);
$CompanyInfo = M("company_statement_info","tab_")
->alias('i')
@ -493,6 +501,10 @@ class PaymentController extends BaseController
$this->error('手机号不能为空');
}
if(strlen($data['mobile']) < 11) {
$this->error('手机号格式错误');
}
$is_hav = M("payment_member")
->where("id = {$data['id']}")
->find();

@ -97,6 +97,25 @@
content: '';
padding: 0;
}
::-webkit-scrollbar {
width: 3px;
height: 3px;
}
::-webkit-scrollbar-track {
border-radius: 3px; /*滚动条的背景区域的圆角*/
}
::-webkit-scrollbar-thumb {
border-radius: 3px; /*滚动条的圆角*/
background-color: #ccc; /*滚动条的背景颜色*/
}
::-webkit-scrollbar-thumb:hover {
background-color: #bbb;
}
::-webkit-scrollbar-thumb:active {
cursor: pointer;
</style>
<div class="cf main-place top_nav_list navtab_list">
@ -250,6 +269,68 @@
</if>
{$_page|default=''}
</div>
<div style="width: 800vw;height:600vh;padding: 0;position: absolute;top: 0;z-index: 9999;background-color:rgba(0,0,0,.6);right: 1px;display: none" id="window">
<div class="layui-layer layui-layer-hui" style="width:600px;height:440px;z-index: 19891015; top:28%; left:35%;border-radius: 2%;background-color:white;color: #0a001f;">
<div style="padding: 15px 30px 15px 20px;font-size: 28px;">打款提示</div>
<div class="layui-layer-content" style="font-size: 22px;padding: 0 25px;">您所选打款单与以下打款单可能存在重复,请谨慎操作</div>
<!-- <div style="padding: 0 25px">-->
<!-- <span style="width: 135px;display: block;float: left;height: 30px;text-align: center;border:#c7c7c7 1px solid;border-right:none;"><span style="display: block;padding: 6px 10px">公司</span></span>-->
<!-- <span style="width: 135px;display: block;float: left;height: 30px;text-align: center;border:#c7c7c7 1px solid;border-right:none;"><span style="display: block;padding: 6px 10px">结算时间</span></span>-->
<!-- <span style="width: 135px;display: block;float: left;height: 30px;text-align: center;border:#c7c7c7 1px solid;border-right:none;"><span style="display: block;padding: 6px 10px">结算金额</span></span>-->
<!-- <span style="width: 136px;display: block;float: left;height: 30px;text-align: center;border:#c7c7c7 1px solid;"><span style="display: block;padding: 6px 10px">支付时间</span></span>-->
<!-- </div>-->
<div class="layui-layer-content" style="font-size: 22px;padding: 5px 25px;height: 200px;overflow-x:hidden;overflow-y:scroll">
<div class="data_list">
<div class="">
<table>
<!-- 表头 -->
<thead>
<tr>
<th>公司</th>
<th>结算时间</th>
<th>结算金额</th>
<th>支付时间</th>
</tr>
</thead>
<!-- 列表 -->
<tbody id="tbody">
<tr>
<td >13214</td>
<td>13214</td>
<td>13214</td>
<td>13214</td>
</tr>
<tr>
<td >13214</td>
<td>13214</td>
<td>13214</td>
<td>13214</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div style="text-align: right;margin-top: 20px">
<div style="font-size: 28px;display: inline-block;">
<div class="search_list" style="justify-content:flex-end;width:100%;">
<div class="input-list" style="float: right;">
<a class="sch-btn" href="javascript:;" style="width: 150px;background: white;border: 1px solid black;color: black" id="back">返回</a>
</div>
</div>
</div>
<div style="padding: 0 20px 0 0;font-size: 28px;display: inline-block;">
<div class="search_list" style="justify-content:flex-end;width:100%;">
<div class="input-list" style="float: right;">
<a class="sch-btn" href="javascript:;" style="width: 150px;" id="commit">确认打款</a>
</div>
</div>
</div>
</div>
</div>
</div>
</block>
<block name="script">
@ -278,18 +359,12 @@
window.location.reload();
}
var pay_status = "{$_GET['pay_stauts']}";
function pay_tip() {
console.log(document.domain);
if (pay_status == '1') {
layer.msg('<font color="white">打款成功</font>');
} else if(pay_status == '0') {
layer.msg('<font color="white">打款失败</font>');
}
}
pay_tip();
$(function(){
$("#back").click(function() {
$('#window').hide();
});
$(".viewPool").click(function () {
var id = $(this).data("id");
var url = "{:U('viewPool')}"+"&id="+id
@ -450,8 +525,76 @@
content: url
});
})
});
function checkPaymentOrder() {
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
var verifystatus = $(elem).data('verifystatus');
if($(elem).data("pay") == 1 && verifystatus == 1){
return $(elem).val();
}
}).get();
console.log(text)
// text = "47,99,100";
$("#tbody").empty();
$.ajax({
type:'post',
dataType:'json',
data: {'ids':text},
url:"{:U('checkOrder')}",
success:function(data) {
if (data.data.length >0) {
var datas = data.data;
var str = "";
$('#window').show();
for (var key in datas) {
str += "<tr><td>" + datas[key]['company_name'] + "</td>"
+ "<td>"+ datas[key]['time'] + "</td>"
+ "<td>"+ datas[key]['statement_money'] + "</td>"
+ "<td>"+ datas[key]['pay_time'] + "</td></tr>";
}
$("#tbody").append(str);
return true;
} else {
doPayment();
return false;
}
},
error:function() {
alert('服务器开小差了,请稍后再试。');
}
})
}
function doPayment() {
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
var verifystatus = $(elem).data('verifystatus');
if($(elem).data("pay") == 1 && verifystatus == 1){
return $(elem).val();
}
}).get();
text = text.join(",");
window.location.href = "{:U('showPayment')}"+"&ids="+text;
}
$("#commit").on("click",function () {
doPayment();
});
$("#doPayment").on("click",function(){
var verifytip = 0;
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
var verifystatus = $(elem).data('verifystatus');
@ -473,6 +616,10 @@
layer.msg("<font style='color:white'>请先选择需要打款的结算单仅大于0.1元的打款单才能进行打款</font>");
return;
}
checkPaymentOrder();
return;
text = text.join(",");
window.location.href = "{:U('showPayment')}"+"&ids="+text;
})

@ -159,7 +159,7 @@
</block>
<block name="script">
<script>
var pay_status = 1;
var DATA={};
// $("#creat_msg").show();
highlight_subnav("{:U('lists')}");
@ -289,7 +289,7 @@
COMPARE.doPayment(function(){
MSG.showmsg("打款结束,执行跳转中......");
setTimeout(function(){
window.location.href = "{:U('lists')}"+'&pay_stauts='+pay_status;
window.location.href = "{:U('lists')}";
},2000)
})
});

@ -101,18 +101,18 @@
<tr>
<th>序号</th>
<th>下游名称</th>
<th>会长账号</th>
<th>下游类型</th>
<th>市场员</th>
<th>下游性质</th>
<th>产品</th>
<th>产品类型</th>
<!-- <th>会长账号</th>-->
<!-- <th>下游类型</th>-->
<!-- <th>市场员</th>-->
<!-- <th>下游性质</th>-->
<!-- <th>产品</th>-->
<!-- <th>产品类型</th>-->
<th>结算时间</th>
<th>推广流水</th>
<th>分成比例</th>
<th>补点</th>
<th>奖励</th>
<th>罚款</th>
<!-- <th>推广流水</th>-->
<!-- <th>分成比例</th>-->
<!-- <th>补点</th>-->
<!-- <th>奖励</th>-->
<!-- <th>罚款</th>-->
<th>结算金额</th>
<th>审批状态</th>
<th>支付宝真实姓名</th>
@ -132,29 +132,29 @@
<!-- <td rowspan="{$com.statement_count}">{$com.company_info.account}</td> -->
<notempty name="com['statement_info']">
<td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['account']}</td>
<else />
<td>-</td>
</notempty>
<td rowspan="{$com.row}">{$com.company_info.company_relation_str}</td>
<td rowspan="{$com.row}">{$com.company_info.nickname}</td>
<td rowspan="{$com.row}">{$com.company_info.company_type_str}</td>
<!-- <notempty name="com['statement_info']">-->
<!-- <td rowspan="{$com['statement_info'][0]['row']}">{$com['statement_info'][0]['account']}</td>-->
<!-- <else />-->
<!-- <td>-</td>-->
<!-- </notempty>-->
<!-- <td rowspan="{$com.row}">{$com.company_info.company_relation_str}</td>-->
<!-- <td rowspan="{$com.row}">{$com.company_info.nickname}</td>-->
<!-- <td rowspan="{$com.row}">{$com.company_info.company_type_str}</td>-->
<notempty name="com['statement_info'][0]['game_list']">
<td>{$com['statement_info'][0]['game_list'][0]['game_name']}</td>
<td>{$com['statement_info'][0]['game_list'][0]['game_type_name']}</td>
<!-- <td>{$com['statement_info'][0]['game_list'][0]['game_name']}</td>-->
<!-- <td>{$com['statement_info'][0]['game_list'][0]['game_type_name']}</td>-->
<td>{$com['statement_info'][0]['game_list'][0]['statement_time']}</td>
<td>{$com['statement_info'][0]['game_list'][0]['pay_amount']}</td>
<td>{$com['statement_info'][0]['game_list'][0]['ratio']|default=0}%</td>
<td>{$com['statement_info'][0]['game_list'][0]['increment_ratio']|default=0}%</td>
<td>{$com['statement_info'][0]['game_list'][0]['reward']}</td>
<td>{$com['statement_info'][0]['game_list'][0]['fine']}</td>
<!-- <td>{$com['statement_info'][0]['game_list'][0]['pay_amount']}</td>-->
<!-- <td>{$com['statement_info'][0]['game_list'][0]['ratio']|default=0}%</td>-->
<!-- <td>{$com['statement_info'][0]['game_list'][0]['increment_ratio']|default=0}%</td>-->
<!-- <td>{$com['statement_info'][0]['game_list'][0]['reward']}</td>-->
<!-- <td>{$com['statement_info'][0]['game_list'][0]['fine']}</td>-->
<td>{$com['statement_info'][0]['game_list'][0]['sum_money']}</td>
<else />
<td>-</td>
<td>-</td>
<!-- <td>-</td>-->
<!-- <td>-</td>-->
<td>-</td>
<td>-</td>
<td>-</td>
@ -178,14 +178,14 @@
<foreach name="com['statement_info'][0]['game_list']" item="game" key="gamekey">
<if condition="$gamekey gt 0">
<tr>
<td>{$game['game_name']}</td>
<td>{$game['game_type_name']}</td>
<!-- <td>{$game['game_name']}</td>-->
<!-- <td>{$game['game_type_name']}</td>-->
<td>{$game['statement_time']}</td>
<td>{$game['pay_amount']}</td>
<td>{$game['ratio']|default=0}%</td>
<td>{$game['increment_ratio']|default=0}%</td>
<td>{$game['reward']}</td>
<td>{$game['fine']}</td>
<!-- <td>{$game['pay_amount']}</td>-->
<!-- <td>{$game['ratio']|default=0}%</td>-->
<!-- <td>{$game['increment_ratio']|default=0}%</td>-->
<!-- <td>{$game['reward']}</td>-->
<!-- <td>{$game['fine']}</td>-->
<td>{$game['sum_money']}</td>
</tr>
</if>
@ -201,14 +201,14 @@
<td rowspan="{$account['row']}">{$account['account']}</td>
<notempty name="account['game_list']">
<td>{$account['game_list'][0]['game_name']}</td>
<td>{$account['game_list'][0]['game_type_name']}</td>
<!-- <td>{$account['game_list'][0]['game_name']}</td>-->
<!-- <td>{$account['game_list'][0]['game_type_name']}</td>-->
<td>{$account['game_list'][0]['statement_time']}</td>
<td>{$account['game_list'][0]['pay_amount']}</td>
<td>{$account['game_list'][0]['ratio']|default=0}%</td>
<td>{$account['game_list'][0]['increment_ratio']|default=0}%</td>
<td>{$account['game_list'][0]['reward']}</td>
<td>{$account['game_list'][0]['fine']}</td>
<!-- <td>{$account['game_list'][0]['pay_amount']}</td>-->
<!-- <td>{$account['game_list'][0]['ratio']|default=0}%</td>-->
<!-- <td>{$account['game_list'][0]['increment_ratio']|default=0}%</td>-->
<!-- <td>{$account['game_list'][0]['reward']}</td>-->
<!-- <td>{$account['game_list'][0]['fine']}</td>-->
<td>{$account['game_list'][0]['sum_money']}</td>
<else />
<td>-</td>
@ -227,14 +227,14 @@
<foreach name="account['game_list']" item="game" key="gamekey">
<if condition="$gamekey gt 0">
<tr>
<td>{$game['game_name']}</td>
<td>{$game['game_type_name']}</td>
<!-- <td>{$game['game_name']}</td>-->
<!-- <td>{$game['game_type_name']}</td>-->
<td>{$game['statement_time']}</td>
<td>{$game['pay_amount']}</td>
<td>{$game['ratio']|default=0}%</td>
<td>{$game['increment_ratio']|default=0}%</td>
<td>{$game['reward']}</td>
<td>{$game['fine']}</td>
<!-- <td>{$game['pay_amount']}</td>-->
<!-- <td>{$game['ratio']|default=0}%</td>-->
<!-- <td>{$game['increment_ratio']|default=0}%</td>-->
<!-- <td>{$game['reward']}</td>-->
<!-- <td>{$game['fine']}</td>-->
<td>{$game['sum_money']}</td>
</tr>
</if>
@ -247,12 +247,12 @@
</notempty>
</foreach>
<tr>
<td colspan=9 >合计:</td>
<td>{$count.platform_amount}</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td colspan=3 >合计:</td>
<!-- <td>{$count.platform_amount}</td>-->
<!-- <td></td>-->
<!-- <td></td>-->
<!-- <td></td>-->
<!-- <td></td>-->
<td>{$count.sum_money}</td>
<td></td>
<td></td>
@ -261,6 +261,7 @@
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>

@ -5,7 +5,7 @@
<form action="{:U('edit')}" method="post" class="form-horizontal form_info_ml">
<div class="cf main-place top_nav_list navtab_list">
<h3 class="page_title">新增复核人</h3>
<h3 class="page_title">编辑复核人</h3>
<p class="description_text"></p>
</div>

@ -158,6 +158,15 @@
</div>
</div>
<div class="input-list">
<input type="text" readonly id="verifytime_start" name="verifytime_start" class="" value="{:I('verifytime_start')}" placeholder="审核开始时间" />
&nbsp;-&nbsp;
<div class="input-append date" style="display:inline-block">
<input type="text" readonly id="verifytime_end" name="verifytime_end" class="" value="{:I('verifytime_end')}" placeholder="审核结束时间" />
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
<div class="input-list">
@ -170,7 +179,7 @@
<div class="butnbox" >
<div class="butnlist jscheckbutn" style="margin-left: 2px">
<if condition="session('payment_user.is_payment') eq 1">
<a class='butn' id='doPayment'>批量打款</a>
<a class='butn' id='doPayment'>打款</a>
</if>
<a class='butn verify' data-value='1'>审核通过</a>
<a class='butn verify' data-value='2'>审核拒绝</a>
@ -458,7 +467,13 @@
});
laydate.render({
elem: '#datetimepicker2'
});
});
laydate.render({
elem: '#verifytime_start'
});
laydate.render({
elem: '#verifytime_end'
});
//回车自动提交
$('.jssearch').find('input').keyup(function(event){
if(event.keyCode===13){

@ -159,7 +159,7 @@
</block>
<block name="script">
<script>
var pay_status = 1;
var DATA={};
// $("#creat_msg").show();
highlight_subnav("{:U('lists')}");
@ -229,7 +229,7 @@
COMPARE.publiucAjax("{:U('poolCount')}",senddata,function(){
MSG.showmsg("打款结束,执行跳转中......");
setTimeout(function(){
window.location.href = "{:U('lists'),array('pay_stauts'=>"+pay_status+")}";
window.location.href = "{:U('lists')}";
},2000)
});
}

@ -207,7 +207,7 @@ $(function(){
<h3 class='no'><i class="icon icon-unfold"></i>账号管理</h3>
<ul class="side-sub-menu" style="display: none;">
<li>
<a class="item" href="{:U('Payment/transfer_set')}">复核账号</a>
<a class="item" href="{:U('Payment/memberList')}">复核账号</a>
</li>
<li>
<a class="item" href="{:U('User/index')}">制单账号</a>

@ -2721,4 +2721,8 @@ ADD COLUMN `company_belong` varchar(60) NOT NULL DEFAULT 0 COMMENT '工会归属
ALTER TABLE `tab_company_statement_info`
ADD COLUMN `pay_verify_status` tinyint(255) NULL DEFAULT 0 COMMENT '审核状态 0 未审核 1 审核通过 2 审核拒绝' AFTER `withdraw_type`,
ADD COLUMN `verify_time` varchar(11) NULL DEFAULT 0 COMMENT '审核时间' AFTER `pay_verify_status`,
ADD COLUMN `verify_member_id` int(11) NULL DEFAULT 0 COMMENT '审核人员id' AFTER `verify_time`;
ADD COLUMN `verify_member_id` int(11) NULL DEFAULT 0 COMMENT '审核人员id' AFTER `verify_time`;
ALTER TABLE `sj_game_channel`.`sj_cptogether_company`
MODIFY COLUMN `phone` varchar(20) NULL DEFAULT NULL COMMENT '联系电话' AFTER `connection_person`,
MODIFY COLUMN `register_phone` varchar(20) NULL DEFAULT NULL COMMENT '注册电话' AFTER `register_address`;
Loading…
Cancel
Save