From f4be3972b27c13fb004941f24162a1fb6d8c9f12 Mon Sep 17 00:00:00 2001 From: chenzhi <294767167@11qq.com> Date: Sun, 26 Jul 2020 16:59:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PublicController.class.php | 76 +++++++------------ .../Controller/VerifyBillController.class.php | 63 +++++++++------ Application/Admin/View/Public/cp_base.html | 2 +- Application/Admin/View/VerifyBill/index.html | 17 +++-- 4 files changed, 81 insertions(+), 77 deletions(-) diff --git a/Application/Admin/Controller/PublicController.class.php b/Application/Admin/Controller/PublicController.class.php index 71c06c301..4755bba10 100644 --- a/Application/Admin/Controller/PublicController.class.php +++ b/Application/Admin/Controller/PublicController.class.php @@ -80,58 +80,40 @@ class PublicController extends \Think\Controller if (!$this->checksafecode($mobile, $verify)) { $this->error('验证码错误'); } - $promote = M('promote_company', 'tab_')->where(['contact_phone' => $mobile])->find(); + $islogon = false; + $promote = M('promote_company', 'tab_')->where(['contact_phone' => $mobile])->select(); + $partner = M('partner', 'tab_')->where(['link_phone' => $mobile,])->select(); + $cp_auth = [ + "mobile_phone"=>$mobile + ]; + if ($promote) { - /* 记录登录SESSION和COOKIES */ - $cp_auth = array( - 'link_man'=>$promote['settlement_contact'], - 'mobile_phone' => $promote['contact_phone'], - 'company_name' => $promote['company_name'], - 'company_type'=>"promote", - 'company_id' => $promote['id'], - ); - $session_name = 'cp_user_auth'; - if (I('auto_login')) { - $expireTime = 60*60*24*30;//自动登录一个月 - ini_set('session.gc_maxlifetime', $expireTime); - ini_set('session.cookie_lifetime', $expireTime); - session($session_name, $cp_auth); - session($session_name.'_sign', data_auth_sign($cp_auth)); - session($session_name.'_expire', time()); - } else { - session($session_name, $cp_auth); - session($session_name.'_sign', data_auth_sign($cp_auth)); + $cp_auth['promote_company_id'] = implode(",",array_column($promote,"id")); + $cp_auth['link_man'] = $promote[0]["settlement_contact"]; + $islogon = true; + } + if ($partner) { + $cp_auth['partner_id'] = implode(",",array_column($partner,"id")); + if(!isset($cp_auth['link_man'])){ + $cp_auth['link_man'] = $partner[0]["settlement_contact"]; } - $uid = $promote['id']; - } else { - $partner = M('partner', 'tab_')->where(['link_phone' => $mobile,])->find(); - if ($partner) { - /* 记录登录SESSION和COOKIES */ - $cp_auth = array( - 'link_man'=>$partner['link_man'], - 'mobile_phone' => $partner['link_phone'], - 'company_name' => $partner['partner'], - 'company_type'=>"cp", - 'company_id' => $partner['id'], - ); - $session_name = 'cp_user_auth'; - if (I('auto_login')) { - $expireTime = 60*60*24*30;//自动登录一个月 - ini_set('session.gc_maxlifetime', $expireTime); - ini_set('session.cookie_lifetime', $expireTime); - session($session_name, $cp_auth); - session($session_name.'_sign', data_auth_sign($cp_auth)); - session($session_name.'_expire', time()); - } else { - session($session_name, $cp_auth); - session($session_name.'_sign', data_auth_sign($cp_auth)); - } - $uid = $partner['id']; - } + $islogon = true; + } + $session_name = 'cp_user_auth'; + if (I('auto_login')) { + $expireTime = 60*60*24*30;//自动登录一个月 + ini_set('session.gc_maxlifetime', $expireTime); + ini_set('session.cookie_lifetime', $expireTime); + session($session_name, $cp_auth); + session($session_name.'_sign', data_auth_sign($cp_auth)); + session($session_name.'_expire', time()); + } else { + session($session_name, $cp_auth); + session($session_name.'_sign', data_auth_sign($cp_auth)); } - if (0 < $uid) { //UC登录成功 + if ($islogon) { //UC登录成功 /* 登录用户 */ $this->success('登录成功！', U('VerifyBill/index')); } else { //登录失败 diff --git a/Application/Admin/Controller/VerifyBillController.class.php b/Application/Admin/Controller/VerifyBillController.class.php index 5d77a29af..88353e32a 100644 --- a/Application/Admin/Controller/VerifyBillController.class.php +++ b/Application/Admin/Controller/VerifyBillController.class.php @@ -34,21 +34,36 @@ class VerifyBillController extends Controller { */ public function index(){ $m_title = '对账单管理'; - $map = [ - "company_id"=>$this->companyinfo['company_id'], - "verify_status"=>['GT',1], - ]; - if($this->companyinfo['company_type'] == 'cp'){ - $map['company_belong'] = 9; - }else{ - $map['company_belong'] = ['NEQ',9]; + $l = $this->companyinfo; + $list_data = []; + $field = "id,company_name,withdraw_type,company_name,company_belong,statement_begin_time,statement_end_time,statement_money,platform_amount,confirm_status,confirm_log,op_time"; + if(isset($l['promote_company_id'])){ + $map = [ + "company_id"=>["in",$l['promote_company_id']], + "confirm_status"=>['NEQ',0], + "company_belong"=>['NEQ',9] + ]; + $list_data = DM('company_statement') + ->field($field) + ->where($map) + ->order('op_time desc') + ->select(); } - - $list_data = DM('company_statement') - ->field("id,withdraw_type,company_name,company_belong,statement_begin_time,statement_end_time,statement_money,platform_amount,verify_status,verify_log,op_time") + + if(isset($l['partner_id'])){ + $map = [ + "company_id"=>["in",$l['partner_id']], + "confirm_status"=>['NEQ',0], + "company_belong"=>9 + ]; + $partner_data = DM('company_statement') + ->field($field) ->where($map) ->order('op_time desc') ->select(); + + $list_data = array_merge($list_data,$partner_data); + } foreach ($list_data as $k => &$v) { $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); @@ -56,10 +71,11 @@ class VerifyBillController extends Controller { $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}"; $v['withdraw_type_1'] = ($v['withdraw_type'] == 1 ? "月结" :"周结"); $v['withdraw_type_2'] = ($v['withdraw_type'] == 2 ? "补点" :"正常结算"); - if ($v['verify_status'] == 2) { + + if ($v['confirm_status'] == 1) { $v['verify_status_str'] = '未确认'; } - if ($v['verify_status'] > 2) { + if ($v['confirm_status'] == 2) { $v['verify_status_str'] = '已确认'; } } @@ -116,21 +132,24 @@ class VerifyBillController extends Controller { { if(!isset($_REQUEST['id'])) $this->error("参数错误"); $id = $_REQUEST['id']; - - $dbres = M("CompanyStatement","tab_")->field("id,verify_status,verify_log")->where("id='{$id}'")->find(); - if($dbres['verify_status'] != 2) return; - $dbres['verify_log'] = json_decode($dbres['verify_log'],true); - $dbres['verify_log']['confirm_user']=$this->companyinfo['mobile_phone']; - $dbres['verify_log']['confirm_time']=date("Y-m-d H:i:s"); - $dbres['verify_log'] = json_encode($dbres['verify_log']); - $dbres['verify_status']=3; + $dbres = M("CompanyStatement","tab_")->field("id,confirm_status,confirm_log")->where("id='{$id}'")->find(); + if($dbres['confirm_status'] != 1){ + $this->ajaxReturn(array( + 'status' => 0, + "info"=>"已确认" + )); + }; + $dbres['confirm_log'] = json_decode($dbres['confirm_log'],true); + $dbres['confirm_log']['confirm_user']=$this->companyinfo['mobile_phone']; + $dbres['confirm_log']['confirm_time']=date("Y-m-d H:i:s"); + $dbres['confirm_log'] = json_encode($dbres['confirm_log']); + $dbres['confirm_status']=2; M("CompanyStatement","tab_")->save($dbres); $this->ajaxReturn(array( 'status' => 1, "info"=>"操作成功" )); } - /** *导出excell * @param int id diff --git a/Application/Admin/View/Public/cp_base.html b/Application/Admin/View/Public/cp_base.html index 7b8bc3980..76583e070 100644 --- a/Application/Admin/View/Public/cp_base.html +++ b/Application/Admin/View/Public/cp_base.html @@ -72,7 +72,7 @@
  • 退出
    • - {:session('cp_user_auth.company_name')} + {:session('cp_user_auth.mobile_phone')}
    diff --git a/Application/Admin/View/VerifyBill/index.html b/Application/Admin/View/VerifyBill/index.html index 3d46ee135..7bef416db 100644 --- a/Application/Admin/View/VerifyBill/index.html +++ b/Application/Admin/View/VerifyBill/index.html @@ -50,6 +50,7 @@ + 公司名称 结算时间 结算周期 结算类型 @@ -70,6 +71,7 @@ + {$data.company_name} {$data.valid} {$data.withdraw_type_1} {$data.withdraw_type_2} @@ -79,8 +81,8 @@ 查看 导出 - - 确认结算单 + + 确认结算单 @@ -126,16 +128,17 @@ window.location.href = url; }); - $(".confirm").click(function(){ + $(".confirm_btn").click(function(){ var id = $(this).data("id"); - var opurl = "{:U('confirm')}"; + var opurl = "{:U('VerifyBill/confirm')}"; + console.log(id,opurl); $.ajax({ - type: "POST", + // type: "POST", url: opurl, - dataType: 'json', - async: false, + // dataType: 'json', data: {id:id}, success:function(data){ + console.log(data) if(data.status==1){ layer.msg("" + data.info + ""); setTimeout(function(){