From 4e1567f01380606cfefc2689dda4701ef9d49a84 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 13 Jan 2020 18:29:57 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=97=E8=A1=A8=E5=8F=8A=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AdminController.class.php | 156 ++++++++++-------- .../Controller/MemberController.class.php | 24 ++- Application/Admin/View/Member/user_info.html | 43 ++--- 3 files changed, 132 insertions(+), 91 deletions(-) diff --git a/Application/Admin/Controller/AdminController.class.php b/Application/Admin/Controller/AdminController.class.php index d62e3d01a..e05372468 100644 --- a/Application/Admin/Controller/AdminController.class.php +++ b/Application/Admin/Controller/AdminController.class.php @@ -565,71 +565,97 @@ class AdminController extends Controller { } - public function addShortcutIcon() { - - $Kuaijieicon = M('Kuaijieicon'); - - $result = $Kuaijieicon->where(['url'=>$_REQUEST['url']])->find(); - - if ($result) { - - if ($result['status'] == 0) { - - $data = array('status'=>1,'id'=>$result['id']); - - $id = $Kuaijieicon->save($data); - - if($id){ - //记录行为 - action_log('Kuaijie/edit', 'Kuaijieicon', $result['id'], UID); - $this->success('添加成功'); - } else { - $this->error('添加失败'); - } - - } else { - - $this->error('已添加过常用设置'); - - } - - } else { + public function addShortcutIcon() { + + $Kuaijieicon = M('Kuaijieicon'); + + $result = $Kuaijieicon->where(['url'=>$_REQUEST['url']])->find(); + + if ($result) { + + if ($result['status'] == 0) { + + $data = array('status'=>1,'id'=>$result['id']); + + $id = $Kuaijieicon->save($data); + + if($id){ + //记录行为 + action_log('Kuaijie/edit', 'Kuaijieicon', $result['id'], UID); + $this->success('添加成功'); + } else { + $this->error('添加失败'); + } + + } else { + + $this->error('已添加过常用设置'); + + } + + } else { + + $data = array('title'=>$_REQUEST['title'],'status'=>1,'url'=>$_REQUEST['url'],'value'=>0); + + $id = $Kuaijieicon->add($data); + + if($id){ + //记录行为 + action_log('Kuaijie/add', 'Kuaijieicon', $id, UID); + $this->success('添加成功'); + } else { + $this->error('添加失败'); + } + + } + } + public function delShortcutIcon($id=0) { + + if (!is_numeric($id) || $id<1) {$this->error('参数错误');} + + $Kuaijieicon = M('Kuaijieicon'); - $data = array('title'=>$_REQUEST['title'],'status'=>1,'url'=>$_REQUEST['url'],'value'=>0); - - $id = $Kuaijieicon->add($data); - - if($id){ - //记录行为 - action_log('Kuaijie/add', 'Kuaijieicon', $id, UID); - $this->success('添加成功'); - } else { - $this->error('添加失败'); - } - - } - } - - - public function delShortcutIcon($id=0) { - - if (!is_numeric($id) || $id<1) {$this->error('参数错误');} - - $Kuaijieicon = M('Kuaijieicon'); - - $data = array('status'=>0,'id'=>$id); - - $res = $Kuaijieicon->save($data); - - if($res){ - //记录行为 - action_log('Kuaijie/del', 'Kuaijieicon', $id, UID); - $this->success('删除成功'); - } else { - $this->error('删除失败'); - } - - - } + $data = array('status'=>0,'id'=>$id); + + $res = $Kuaijieicon->save($data); + + if($res){ + //记录行为 + action_log('Kuaijie/del', 'Kuaijieicon', $id, UID); + $this->success('删除成功'); + } else { + $this->error('删除失败'); + } + + + } + /** + * 验证列表的展示或者统计权限 + * @param [type] $type 0:"_list_check",1:"_count_check" + * @return void + */ + public function checkListOrCountAuth($type,$checkarr = false) + { + $flag = false; + if(IS_ROOT){ $flag=true; } + $suffix = $type=="list" ? "_list_check" :"_count_check"; + $rule = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME.$suffix); + if($this->checkRule($rule,array('in','1,2'))){ + $flag = true; + } + if(!$flag && $checkarr){ + foreach ($checkarr as $v) { + if(isset($_REQUEST[$v])){ + $flag = true; + }; + } + } + if($type == "count"){ + $this->assign("rule_count_check",$flag); + }else{ + return $flag; + } + + } } diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index f4ab7e9c2..40548f3e6 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -12,11 +12,12 @@ class MemberController extends ThinkController /** *玩家列表信息 */ + public function user_info($p=0){ //设定默认时间 - if(!array_key_exists("time_start",$_REQUEST) && I('type') != 2){ - $this->redirect(ACTION_NAME, array('time_start' => date('Y-m-d',strtotime('-30 day')),"time_end"=>date('Y-m-d'))); - } + // if(!array_key_exists("time_start",$_REQUEST) && I('type') != 2){ + // $this->redirect(ACTION_NAME, array('time_start' => date('Y-m-d',strtotime('-30 day')),"time_end"=>date('Y-m-d'))); + // } //基础信息 $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 @@ -53,7 +54,13 @@ class MemberController extends ThinkController $map['tab_user.id'] = $_REQUEST['user_id']; } if (isset($_REQUEST['account'])) { - $map['tab_user.account'] = ['like',I('account') . "%"]; + //列表无权限要精准搜索 + if($this->checkListOrCountAuth("list")){ + $map['tab_user.account'] = ['like',I('account') . "%"]; + }else{ + $map['tab_user.account'] =I('account'); + } + } if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { $map['tab_user.register_time'] = ['between', [strtotime(I('time_start')), strtotime(I('time_end')) + 86399]]; @@ -135,6 +142,13 @@ class MemberController extends ThinkController } } } + //判断列表权限 + $listauth = $this->checkListOrCountAuth("count"); + $listauth = $this->checkListOrCountAuth("list",["user_id","account","device_number"]); + if(!$listauth){ + //没权限 + $map['tab_user.id'] = 0; + } //计算用户列表 $data = M("user","tab_") @@ -304,8 +318,6 @@ class MemberController extends ThinkController $history_count = $history_count->find()['recharge_total']; $this->assign('history_count', $history_count?:0); } - - $this->assign('user_count',$user_count); $this->assign('now_count', $now_count?:0); diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index 42450fb62..fb0879e78 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -235,7 +235,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! @@ -327,27 +327,30 @@ - - 汇总: - - - - 当前用户累计充值：{$now_count} 　　 - 历史累计充值:{$history_count}　　 - 用户数:{$user_count} - - - 当前用户累计充值:　当前属于该推广员的用户的充值累计（不含用户换绑前记录）　　/　　 - 历史累计充值:　历史中属于该推广员的用户的充值累计（含用户换绑前记录） - - - - 当前用户累计充值：{$now_count}　　用户数:{$user_count} - + + + 汇总: - + + + 当前用户累计充值：{$now_count} 　　 + 历史累计充值:{$history_count}　　 + 用户数:{$user_count} + + + 当前用户累计充值:　当前属于该推广员的用户的充值累计（不含用户换绑前记录）　　/　　 + 历史累计充值:　历史中属于该推广员的用户的充值累计（含用户换绑前记录） + + + + 当前用户累计充值：{$now_count}　　用户数:{$user_count} + + + + + + - From 07e4fb2e5648dca4a18e1591e61f40566b2ffd32 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 14 Jan 2020 10:01:01 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=92=8C=E7=BB=9F=E8=AE=A1=E6=9D=83=E9=99=90=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AdminController.class.php | 43 ++++++++++--------- .../Controller/MemberController.class.php | 26 ++--------- 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/Application/Admin/Controller/AdminController.class.php b/Application/Admin/Controller/AdminController.class.php index e05372468..7815625a3 100644 --- a/Application/Admin/Controller/AdminController.class.php +++ b/Application/Admin/Controller/AdminController.class.php @@ -634,28 +634,31 @@ class AdminController extends Controller { * @param [type] $type 0:"_list_check",1:"_count_check" * @return void */ - public function checkListOrCountAuth($type,$checkarr = false) - { - $flag = false; - if(IS_ROOT){ $flag=true; } - $suffix = $type=="list" ? "_list_check" :"_count_check"; - $rule = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME.$suffix); - if($this->checkRule($rule,array('in','1,2'))){ - $flag = true; - } - if(!$flag && $checkarr){ - foreach ($checkarr as $v) { - if(isset($_REQUEST[$v])){ - $flag = true; - }; - } - } - if($type == "count"){ - $this->assign("rule_count_check",$flag); + public function checkListOrCountAuthRestMap(&$map,$checkarr = false,$countfield = "rule_count_check"){ + //验证count + if(IS_ROOT){ + $this->assign($countfield,true); }else{ - return $flag; + $countRule = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME."_count_check"); + $this->assign($countfield,$this->checkRule($countRule,array('in','1,2'))); + //验证list + $listrule = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME."_list_check"); + $listflag = $this->checkRule($listrule,array('in','1,2')); + if(!$listflag && $checkarr){ + foreach ($checkarr as $v) { + if(isset($map[$v])){ + //如果有模糊查询改精准查询 + if($map[$v][0] == "like"){ + $map[$v] = trim($map[$v][1],"%"); + } + $listflag = true; + }; + } + } + if(!$listflag){ + $map["_string"] = "1=0"; + } } - } } diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 40548f3e6..1ba0f2a9d 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -54,13 +54,7 @@ class MemberController extends ThinkController $map['tab_user.id'] = $_REQUEST['user_id']; } if (isset($_REQUEST['account'])) { - //列表无权限要精准搜索 - if($this->checkListOrCountAuth("list")){ - $map['tab_user.account'] = ['like',I('account') . "%"]; - }else{ - $map['tab_user.account'] =I('account'); - } - + $map['tab_user.account'] = ['like',I('account') . "%"]; } if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { $map['tab_user.register_time'] = ['between', [strtotime(I('time_start')), strtotime(I('time_end')) + 86399]]; @@ -105,15 +99,6 @@ class MemberController extends ThinkController $map['tab_user.device_number'] = $_REQUEST['device_number']; } $promoteRoot = getPowerPromoteIds(); - -// $data_empower_type = session('user_auth')['data_empower_type']; -//// var_dump($promoteRoot);die(); -// -// if ($promoteRoot) { -// $map['tab_user.promote_id'] =array('in',$promoteRoot); -// } else if(!$promoteRoot&&$data_empower_type!=1){ -// $map['tab_user.id'] = array('lt',1); -// } setPowerPromoteIds($map,'tab_user.promote_id'); //1.3 与推广员相关 @@ -142,13 +127,8 @@ class MemberController extends ThinkController } } } - //判断列表权限 - $listauth = $this->checkListOrCountAuth("count"); - $listauth = $this->checkListOrCountAuth("list",["user_id","account","device_number"]); - if(!$listauth){ - //没权限 - $map['tab_user.id'] = 0; - } + //判断是否有列表和统计的权限 + $this->checkListOrCountAuthRestMap($map,["tab_user.id","tab_user.account","tab_user.device_number"]); //计算用户列表 $data = M("user","tab_") From 5fdb7946ccb6244bc0572b18f6cfa23c18c99d0c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 14 Jan 2020 10:16:09 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=99=BB=E9=99=86?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E7=BB=9F=E8=AE=A1=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/MemberController.class.php | 3 +++ Application/Admin/View/Member/login_record.html | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 1ba0f2a9d..d705ef365 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -1163,6 +1163,9 @@ class MemberController extends ThinkController } // $map['type'] = 1; // $map['login_time'] = ['exp', 'login_time<>0']; + //判断是否有列表和统计的权限 + $this->checkListOrCountAuthRestMap($map,["user_account"]); + $extend = array(); $extend['map'] = $map; $count = M('UserLoginRecord','tab_') diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html index cd1327b1a..b48c24183 100644 --- a/Application/Admin/View/Member/login_record.html +++ b/Application/Admin/View/Member/login_record.html @@ -160,10 +160,12 @@ - - 合计 - 　　登录玩家：{$user_count}人 - + + + 合计 + 　　登录玩家：{$user_count}人 + + From ef975943bbe3485ea3f2722913c3c407209a9d03 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 14 Jan 2020 15:54:42 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E9=92=88=E5=AF=B9admin=E7=9A=84=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=8F=B7=E5=AF=B9=E6=B8=B8=E6=88=8F=E5=85=85?= =?UTF-8?q?=E5=80=BC=E5=92=8C=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E5=81=9A?= =?UTF-8?q?=E5=AE=8C=E5=85=A8=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E5=AE=8C=E5=85=A8=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=97=B6=E5=BF=85=E9=A1=BB=E9=80=9A=E8=BF=87=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=89=8D=E6=98=BE=E7=A4=BA=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/SpendController.class.php | 1 + Application/Admin/Controller/UserController.class.php | 5 +++++ Application/Admin/View/User/rolelist.html | 3 +++ 3 files changed, 9 insertions(+) diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index a90a2a13f..d4f4d7821 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -111,6 +111,7 @@ class SpendController extends ThinkController // $map = '1 = 2'; // $map1 = $map; // } + $this->checkListOrCountAuthRestMap($map,["extend", "pay_order_number", "user_account"]); $map1 = $map; $map1['pay_status'] = 1; $total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount')); diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 9ce267470..6f9d23912 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -631,6 +631,10 @@ class UserController extends AdminController $map['role_name'] = trim($_REQUEST['role_name']); unset($_REQUEST['role_name']); } + if (isset($_REQUEST['role_id'])) { + $map['role_id'] = trim($_REQUEST['role_id']); + unset($_REQUEST['role_id']); + } // $promoteRoot = getPowerPromoteIds(); // $data_empower_type = session('user_auth')['data_empower_type']; @@ -668,6 +672,7 @@ class UserController extends AdminController empty(I('user_account')) || $map['user_account'] = ['like', "%" . I('user_account') . "%"]; + $this->checkListOrCountAuthRestMap($map,["role_id", "role_name", "user_account"]); $list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc'); $this->assign('list', $list); $this->meta_title = '角色数据'; diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index d94296fd7..8c16ce304 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -59,6 +59,9 @@
   
+
+     +
对账单类型 生成时间 对账公司 对账日期 对账金额 + 审核状态 确认状态 操作 @@ -125,11 +129,14 @@ + + 上游对账单下游对账单下游补点对账单下游个人结算单 {$data.create_time} {$data.company_name} {$data.statement_begin_time}-{$data.statement_end_time} {$data.statement_money} + 未审核审核通过审核拒绝 未确认确认 查看 @@ -189,7 +196,53 @@ function reload() { window.location.reload(); } + $(function(){ + + $("#shenhe").click(function () { + var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { + return $(elem).val(); + }).get().join(","); + + layer.confirm('【警告】撤销后将不可回退，如需继续请点击确认', { + btn: ['确认','取消'], + title:false + }, function(index) { + if (!text) { + layer.msg('请选择后再进行操作'); + return; + } + + var url = "/admin.php?s=/statementMangement/verifyStatementStatus/order/" + text; + + window.location.href = url; + }) + + + }) + + $("#reject").click(function () { + var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { + return $(elem).val(); + }).get().join(","); + + + layer.confirm('【警告】撤销后将不可回退，如需继续请点击确认', { + btn: ['确认','取消'], + title:false + }, function(index) { + if (!text) { + layer.msg('请选择后再进行操作'); + return; + } + + var url = "/admin.php?s=/statementMangement/rejectStatementStatus/order/" + text; + + window.location.href = url; + }) + + }) + //搜索功能 var start = $("#time_start").val(); var end = $("#time_end").val(); diff --git a/Data/update.sql b/Data/update.sql index 2998e4fa1..47ce72f23 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1347,3 +1347,7 @@ CREATE TABLE `tab_financial_summary` ( KEY `count_year` (`count_year`) USING BTREE, KEY `key_name` (`key_name`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='财务分类汇总统计'; + +--2020-02-20 添加审核状态-- +ALTER TABLE `tab_statement` +ADD COLUMN `verify_status` tinyint(2) NULL DEFAULT 0 COMMENT '审核状态 0:未审核 1:审核通过 2:审核拒绝' AFTER `statement_info`; \ No newline at end of file From c05b10cb87a1084a459cf0c01c01b734e7db31eb Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Thu, 20 Feb 2020 10:54:53 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F-=E3=80=8B=E6=9C=AA=E5=AE=A1=E6=A0=B8=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/VerifyBillController.class.php | 13 ++++++++++++- Application/Admin/View/VerifyBill/index.html | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/VerifyBillController.class.php b/Application/Admin/Controller/VerifyBillController.class.php index 1c2344f53..7473253d7 100644 --- a/Application/Admin/Controller/VerifyBillController.class.php +++ b/Application/Admin/Controller/VerifyBillController.class.php @@ -38,6 +38,13 @@ class VerifyBillController extends Controller { ->select(); foreach ($list_data as $key => $value) { $list_data[$key]['statement_type_str'] = $value['statement_type'] ? '工会对账单' : 'cp对账单'; + if ($value['verify_status'] == 1) { + $list_data[$key]['verify_status_str'] = '审核通过'; + } elseif ($value['verify_status'] == 1) { + $list_data[$key]['verify_status_str'] = '审核拒绝'; + } else { + $list_data[$key]['verify_status_str'] = '未审核'; + } } $this->assign('list_data', $list_data); $this->assign('meta_title', $m_title); @@ -61,7 +68,11 @@ class VerifyBillController extends Controller { $this->assign('all_sum_money', $all_sum_money); $this->assign('all_pay_amount', $all_pay_amount); $this->assign('data', $data); - $this->assign('from', I('from')); + $from = I('from'); + if (empty($from) && $data['verify_status'] != 1) {//未审核通过不可确认 + $from = 'not_verify'; + } + $this->assign('from', $from); if ($data['statement_type'] == 1) {//下游 $template = 'company_show'; } else { diff --git a/Application/Admin/View/VerifyBill/index.html b/Application/Admin/View/VerifyBill/index.html index 7d5224802..24a50b496 100644 --- a/Application/Admin/View/VerifyBill/index.html +++ b/Application/Admin/View/VerifyBill/index.html @@ -48,6 +48,7 @@ 生成时间 对账单日期 对账金额 + 审核状态 确认状态 操作 @@ -67,6 +68,7 @@ {:set_show_time($data['create_time'])} {:set_show_time($data['statement_begin_time'])}-{:set_show_time($data['statement_end_time'])} {$data.statement_money} + {$data.verify_status_str} From 260ca6fe9ebfac7fd3015df9e42cc70a7f6501ae Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 20 Feb 2020 16:10:39 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StatementMangementController.class.php | 16 ++++--- .../Admin/View/StatementMangement/lists.html | 46 +++++++++++++++++-- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index bbb47320f..46f5d5e6e 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -22,6 +22,10 @@ class StatementMangementController extends ThinkController $map['create_time'] = ['LT', strtotime(I('time_end')) + 86399]; } + if ($_REQUEST['verify_status']||$_REQUEST['verify_status']=='0') { + $map['verify_status'] = $_REQUEST['verify_status']; + } + if ($_REQUEST['statement_type']||$_REQUEST['statement_type']=='0') { if($_REQUEST['statement_type']=='2') { $map['second_party_info'] = ['like','%"order_type":1%']; @@ -845,12 +849,12 @@ class StatementMangementController extends ThinkController $isVerify = M('statement','tab_')->where(['id'=>['in',$order]])->save(['verify_status'=>1]); if ($isVerify) { - $this->success('审核通过成功'); + $this->ajaxReturn(['status'=>1]); } else { - $this->error('审核通过失败'); + $this->ajaxReturn(['status'=>0]); } } else { - $this->error('没有订单数据'); + $this->ajaxReturn(['status'=>0]); } } @@ -864,12 +868,12 @@ class StatementMangementController extends ThinkController $isVerify = M('statement','tab_')->where(['id'=>['in',$order]])->save(['verify_status'=>2]); if ($isVerify) { - $this->success('审核拒绝成功'); + $this->ajaxReturn(['status'=>1]); } else { - $this->error('审核拒绝失败'); + $this->ajaxReturn(['status'=>0]); } } else { - $this->error('没有订单数据'); + $this->ajaxReturn(['status'=>0]); } } diff --git a/Application/Admin/View/StatementMangement/lists.html b/Application/Admin/View/StatementMangement/lists.html index 7aeb0cf80..a02ffcf91 100644 --- a/Application/Admin/View/StatementMangement/lists.html +++ b/Application/Admin/View/StatementMangement/lists.html @@ -81,6 +81,14 @@
+
+ +
@@ -213,9 +221,22 @@ return; } - var url = "/admin.php?s=/statementMangement/verifyStatementStatus/order/" + text; - - window.location.href = url; + $.ajax({ + url: "{:U('statementMangement/verifyStatementStatus')}", + type: "get", + data: {order: text}, + dataType: 'json', + success: function (data) { + if (data.status == 0) { + layer.msg('审核通过失败'); + } else { + layer.msg('审核通过成功') + setTimeout(function(){ + window.parent.reload(); + },1500); + } + } + }); }) @@ -236,9 +257,24 @@ return; } - var url = "/admin.php?s=/statementMangement/rejectStatementStatus/order/" + text; + $.ajax({ + url: "{:U('statementMangement/rejectStatementStatus')}", + type: "get", + data: {order: text}, + dataType: 'json', + success: function (data) { + if (data.status == 0) { + layer.msg('审核拒绝失败'); + } else { + layer.msg('审核拒绝成功') + + setTimeout(function(){ + window.parent.reload(); + },1500); + } + } + }); - window.location.href = url; }) }) From 009ef6719d451d39047ade62c8f6e8bebbb89678 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 20 Feb 2020 16:20:15 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/StatementMangement/lists.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Application/Admin/View/StatementMangement/lists.html b/Application/Admin/View/StatementMangement/lists.html index a02ffcf91..732090faa 100644 --- a/Application/Admin/View/StatementMangement/lists.html +++ b/Application/Admin/View/StatementMangement/lists.html @@ -217,7 +217,7 @@ title:false }, function(index) { if (!text) { - layer.msg('请选择后再进行操作'); + layer.msg("" + '请选择后再进行操作' + ""); return; } @@ -228,9 +228,9 @@ dataType: 'json', success: function (data) { if (data.status == 0) { - layer.msg('审核通过失败'); + layer.msg("" + '审核通过失败' + ""); } else { - layer.msg('审核通过成功') + layer.msg("" + '审核通过成功' + "") setTimeout(function(){ window.parent.reload(); },1500); @@ -253,7 +253,7 @@ title:false }, function(index) { if (!text) { - layer.msg('请选择后再进行操作'); + layer.msg("" + '请选择后再进行操作' + ""); return; } @@ -264,9 +264,9 @@ dataType: 'json', success: function (data) { if (data.status == 0) { - layer.msg('审核拒绝失败'); + layer.msg("" + '审核拒绝失败' + ""); } else { - layer.msg('审核拒绝成功') + layer.msg("" + '审核拒绝成功' + "") setTimeout(function(){ window.parent.reload(); From 31466db00d12f8a84ec028d2e16814a0f74a05cf Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 20 Feb 2020 16:25:01 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=93=E5=AE=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ToolController.class.php | 2 +- Application/Admin/View/Tool/payset.html | 125 ++++++++++++++++++ Data/update.sql | 5 +- 3 files changed, 130 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 6973bfc81..5e41ec38a 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -214,7 +214,7 @@ class ToolController extends ThinkController { */ public function payset($value='') { - $str = "alipay,weixin,wei_xin,wei_xin_app,jubaobar,weixin_gf,jft,jft_wap,goldpig,ptb_pay,bind_pay,sqpay,heepay"; + $str = "alipay,weixin,wei_xin,wei_xin_app,jubaobar,weixin_gf,jft,jft_wap,goldpig,ptb_pay,bind_pay,sqpay,heepay,yeepay"; $this->BaseConfig($str); $this->meta_title = '支付设置'; diff --git a/Application/Admin/View/Tool/payset.html b/Application/Admin/View/Tool/payset.html index 352ea0fd4..3af6d1f0f 100644 --- a/Application/Admin/View/Tool/payset.html +++ b/Application/Admin/View/Tool/payset.html @@ -29,6 +29,7 @@
  • 平台币支付
  • 绑币支付
    • +
  • 易宝支付
  • 双乾支付
  • 威富通支付
    • @@ -1355,6 +1356,130 @@
    +
    + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    商户号 + + + + 双乾商户号 + +
    双乾密钥key + + + + 双乾秘钥 + +
    支付方式: + + + + + 快捷支付 +
    日支付限量 + + + + 当额度达到限制额度时，隐藏支付方式 + +
    月支付限量 + + + + 当额度达到限制额度时，隐藏支付方式 + +
    启用状态 + + + + + + + + 开启状态 + +
    渠道费率 + + + + % + +
    + + + + +
    + +
    + +
    +
    diff --git a/Data/update.sql b/Data/update.sql index ffc3de4ef..53434d392 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1353,4 +1353,7 @@ ALTER TABLE tab_promote ADD COLUMN `group_remark` varchar(50) NOT NULL DEFAULT '' COMMENT '部门/小组'; --2020-02-20 添加审核状态-- ALTER TABLE `tab_statement` -ADD COLUMN `verify_status` tinyint(2) NULL DEFAULT 0 COMMENT '审核状态 0:未审核 1:审核通过 2:审核拒绝' AFTER `statement_info`; \ No newline at end of file +ADD COLUMN `verify_status` tinyint(2) NULL DEFAULT 0 COMMENT '审核状态 0:未审核 1:审核通过 2:审核拒绝' AFTER `statement_info`; + +-- 支付类型添加易宝支付 +INSERT INTO `platform`.`tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('yeepay', '易宝支付', '', NULL, 1, 1, NULL); From 2c7eb8f1910fd3a89a6fbd84293d62de588ba5d2 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 20 Feb 2020 16:28:46 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=93=E5=AE=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index 53434d392..4ecdaa17f 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1356,4 +1356,4 @@ ALTER TABLE `tab_statement` ADD COLUMN `verify_status` tinyint(2) NULL DEFAULT 0 COMMENT '审核状态 0:未审核 1:审核通过 2:审核拒绝' AFTER `statement_info`; -- 支付类型添加易宝支付 -INSERT INTO `platform`.`tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('yeepay', '易宝支付', '', NULL, 1, 1, NULL); +INSERT INTO `platform`.`tab_tool`( `name`, `title`, `config`, `template`, `type`, `status`, `create_time`) VALUES ('yeepay', '易宝支付', '', '', 1, 1, 0);