diff --git a/Application/Admin/Controller/CompanyStatementOfflineController.class.php b/Application/Admin/Controller/CompanyStatementOfflineController.class.php index 842d9653d..b80ee82ef 100644 --- a/Application/Admin/Controller/CompanyStatementOfflineController.class.php +++ b/Application/Admin/Controller/CompanyStatementOfflineController.class.php @@ -90,9 +90,14 @@ class CompanyStatementOfflineController extends ThinkController } if ($v['pay_check'] == 0) { - $v['pay_check_str'] = "未确认"; + $v['pay_check_str'] = "---"; } else { - $v['pay_check_str'] = "已确认"; + $member = M("ucenter_member") + ->field("username") + ->where(['id'=>$v['pay_check_member_id']]) + ->find(); + $v['pay_check_str'] = $member['username'].(($v['pay_check'] == 1)?'已确认':'未确认')."
".date('Y-m-d H:i:s', $v['pay_check_time']);; +// $v['pay_check_str'] = "已确认"; } $v['oplist'] = $this->OpAuth($v); @@ -149,6 +154,7 @@ class CompanyStatementOfflineController extends ThinkController //修改打款设置 public function editPayment(){ +// dump($_SESSION);die(); if(!isset($_REQUEST['info'])) $this->error("参数错误"); $info = $_REQUEST['info']; @@ -171,7 +177,9 @@ class CompanyStatementOfflineController extends ThinkController "company_info"=>json_encode($company_info,JSON_UNESCAPED_UNICODE), "remark"=>$v['remark'], "pay_check"=>1, - "id"=>$k + "pay_check_member_id"=> $_SESSION['onethink_admin']['user_auth']['uid'], + "id"=>$k, + "pay_check_time"=>time() ]; $CompanyInfo->save($savedata); @@ -185,6 +193,30 @@ class CompanyStatementOfflineController extends ThinkController } + public function returnSetPayment() { + + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + + $ids = explode(',',$ids); + + $CompanyInfo = M("company_statement_info","tab_"); + + $CompanyInfo + ->where(['id'=>['in',$ids]]) + ->save([ + 'pay_check'=>0, + 'pay_check_member_id'=>0, + 'pay_check_time'=>0 + ]); + + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"打款信息编辑成功" + )); + + } + public function doPayment() { if(!isset($_REQUEST['ids']) || !isset($_REQUEST['payment_time'])) $this->error("参数错误"); @@ -315,6 +347,7 @@ class CompanyStatementOfflineController extends ThinkController { $mentBtn = [ "setPayment"=>"打款信息确认", + "returnSetPayment"=>"打款信息确认撤回", "doPayment"=>"打款确认", "export"=>"批量导出", ]; diff --git a/Application/Admin/View/CompanyStatementOffline/lists.html b/Application/Admin/View/CompanyStatementOffline/lists.html index 5e167bb4c..9ad1cfb8c 100644 --- a/Application/Admin/View/CompanyStatementOffline/lists.html +++ b/Application/Admin/View/CompanyStatementOffline/lists.html @@ -161,7 +161,7 @@ 结算时间 结算金额 结算流水 - + 打款信息确认状态 打款状态 汇总单号汇总单号 @@ -179,12 +179,13 @@ - + {$data.company_name} {$data.company_type_str} {$data.valid} {$data.statement_money} {$data.platform_amount} + {$data.pay_check_str} {$data.payment} {$data.statement_num} @@ -264,6 +265,44 @@ }) $("#company_type").change(); + $("#setPayment").on('click',function(){ + + var tip = 0; + + var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { + + if($(elem).data("pay_check") == 0){ + return $(elem).val(); + } else { + tip = 1; + } + + }).get(); + + if(tip == 1) { + layer.msg("请选择打款信息未确认的单子"); + return; + } + + text = text.join(","); + + if (!text) { + layer.msg("没有符合打款确认的打款单,请重新选择"); + return; + } + + var url = "{:U('setPayment')}"+"&id="+text + layer.open({ + type: 2, + title: "海南万盟天下科技有限公司", + shadeClose: true, + shade: 0.8, + area: ['100%', '100%'], + content: url + }); + + }); + $(".viewStatement").click(function () { var id = $(this).data("id"); var url = "{:U('viewStatement')}"+"&id="+id @@ -277,14 +316,84 @@ }); }); + $("#returnSetPayment").on("click",function () { + + var paystatustip = 0; + var tip = 0; + + var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { + + if($(elem).data("pay_check") == 1 && $(elem).data("paystatus") != 1){ + return $(elem).val(); + } + + if ($(elem).data("pay_check") != 1) { + tip = 1; + } + + if ($(elem).data("paystatus") == 1) { + paystatustip = 1; + } + + }).get(); + + if(tip == 1) { + layer.msg("请选择打款信息已确认的单子"); + return; + } + + if(paystatustip == 1) { + layer.msg("请选择未打款的单子"); + return; + } + + text = text.join(","); + + layer.confirm('【提示】是否确认打款信息撤回', { + btn: ['确认','取消'], + title:false + }, function(){ + $.ajax({ + type:'post', + dataType:'json', + data: {'ids':text}, + url:"{:U('returnSetPayment')}", + success:function(data) { + if (data.status == 1) { + layer.msg("打款信息确认撤回成功"); + window.location.reload(); + return; + } + }, + error:function() { + alert('服务器开小差了,请稍后再试。'); + } + }) + }); + + + }); + $("#doPayment").on("click",function(){ var id = $(this).attr("id"); + var pay_check_tip = 0; + var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - if($(elem).data("paystatus") == 0){ + if($(elem).data("paystatus") == 0&&$(elem).data("pay_check") == 1){ return $(elem).val(); } + + if ($(elem).data("pay_check") != 1) { + pay_check_tip = 1; + } + }).get(); + if (pay_check_tip == 1) { + layer.msg("请选择打款信息已经确认的单子"); + return; + } + if(text.length < 1){ layer.msg("无需要进行确认打款确认操作的数据"); return; diff --git a/Application/Admin/View/CompanyStatementOffline/setPayment.html b/Application/Admin/View/CompanyStatementOffline/setPayment.html new file mode 100644 index 000000000..4463f07d7 --- /dev/null +++ b/Application/Admin/View/CompanyStatementOffline/setPayment.html @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号合作公司是否支付宝打款户名帐号开户行关联结算汇总单订单号结算金额(元)备注
{$key-0+1}{$vo.company_name}{$vo.statement_num}{$vo.statement_money}
{$key-0+1}{$vo.company_name}{$vo.company_info.ali_user}{$vo.company_info.ali_account}{$vo.company_info.payee_name}{$vo.company_info.bank_account}{$vo.company_info.opening_bank}{$vo.statement_num}{$vo.statement_money}{$vo.remark}
合计:结算总金额:{$all_money}
+
+
+
+ +
+ + + + + + \ No newline at end of file diff --git a/Application/Payment/Controller/PaymentController.class.php b/Application/Payment/Controller/PaymentController.class.php index 86b67acfd..b3182acaa 100644 --- a/Application/Payment/Controller/PaymentController.class.php +++ b/Application/Payment/Controller/PaymentController.class.php @@ -794,7 +794,7 @@ class PaymentController extends BaseController "company_info"=>json_encode($company_info,JSON_UNESCAPED_UNICODE), "remark"=>$v['remark'], "pay_check"=>1, - "pay_check_member_id"=>$member_id = $_SESSION['onethink_admin']['payment_user']['id'], + "pay_check_member_id"=> $_SESSION['onethink_admin']['payment_user']['id'], "id"=>$k, "pay_check_time"=>time() ]; diff --git a/Application/Payment/View/Payment/setPayment.html b/Application/Payment/View/Payment/setPayment.html new file mode 100644 index 000000000..110c1bfda --- /dev/null +++ b/Application/Payment/View/Payment/setPayment.html @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号合作公司是否支付宝打款户名帐号关联结算汇总单订单号结算金额(元)备注
{$key-0+1}{$vo.company_name}{$vo.statement_num}{$vo.statement_money}
{$key-0+1}{$vo.company_name}{$vo.company_info.ali_user}{$vo.company_info.ali_account}{$vo.company_info.payee_name}{$vo.company_info.bank_account}{$vo.company_info.opening_bank}{$vo.statement_num}{$vo.statement_money}{$vo.remark}
合计:结算总金额:{$all_money}
+
+
+
+ +
+ + + + + + \ No newline at end of file