搜索
@@ -106,9 +114,15 @@
提现单号 |
-
提现金额 |
+
提现金额 |
推广员账号 |
-
申请时间 |
+
操作人 |
+
操作人类型 |
+
最后操作人 |
+
最后操作人类型 |
+
结算开始时间 |
+
结算截止时间 |
+
申请时间 |
提现状态 |
说明 |
审核时间 |
@@ -142,8 +156,30 @@
{:encryptStr(get_promote_name($data['promote_id']))}
+
+
+ {:get_promote_name($data['op_id'])}
+
+ {:getAdminNickname($data['op_id'])}
+
+ 自动
+
+ |
+
{:getPromoteWithdrawOpType($data['op_type'])} |
+
+
+ {:get_promote_name($data['last_op_id'])}
+
+ {:getAdminNickname($data['last_op_id'])}
+
+ 自动
+
+ |
+
{:getPromoteWithdrawOpType($data['last_op_type'])} |
+
{$data.settlement_begin_time|date='Y-m-d H:i:s',###}--- |
+
{$data.settlement_end_time|date='Y-m-d H:i:s',###}--- |
{$data.create_time|date='Y-m-d H:i:s',###}--- |
-
{:promoteWithdrawStatus($data['status'])} |
+
style="color: #999;">{:promoteWithdrawStatus($data['status'])} |
{$data.respond} |
{$data.audit_time|date='Y-m-d H:i:s',###}--- |
@@ -161,7 +197,7 @@
|
| 汇总 |
- 当页提现：{:null_to_0(array_sum(array_column(arrayPromoteWithdrawStatus('status','',$list_data),'sum_money')))}元 ； 今日提现：{:null_to_0(floor($ttotal*100)/100)}元 ； 昨日提现：{:null_to_0(floor($ytotal*100)/100)}元 ； 累计提现：{:null_to_0(floor($total*100)/100)}元 |
+ 当页提现：{:null_to_0(array_sum(array_column(arrayPromoteWithdrawStatus('status','',$list_data),'sum_money')))}元 ； 今日提现：{:null_to_0(floor($ttotal*100)/100)}元 ； 昨日提现：{:null_to_0(floor($ytotal*100)/100)}元 ； 累计提现：{:null_to_0(floor($total*100)/100)}元 |
diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php
index c7d4909d2..b45da22c6 100644
--- a/Application/Common/Common/function.php
+++ b/Application/Common/Common/function.php
@@ -1430,6 +1430,7 @@ if (!function_exists('dd')) {
function promoteWithdrawStatus($status = null)
{
$statusData = [
+ -2 => '已撤销',
-1 => '审核未通过',
0 => '待审核',
1 => '汇款中',
@@ -1443,3 +1444,22 @@ function promoteWithdrawStatus($status = null)
return $statusData;
}
+//获取提现操作人类型
+function getPromoteWithdrawOpType($opType = null)
+{
+ if ($opType) {
+ return Admin\Model\WithdrawModel::$opTypeList[$opType] ?? '未知';
+ } else {
+ return Admin\Model\WithdrawModel::$opTypeList;
+ }
+}
+
+//获取管理员账号
+function getAdminNickname($adminId)
+{
+ $adminId = intval($adminId);
+ if ($adminId) {
+ return M('member')->where(array('id' => $adminId))->getField('nickname');
+ }
+ return '未知';
+}
diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php
index c0c245b2e..a61cc0b36 100644
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@@ -284,6 +284,7 @@ class FinanceController extends BaseController
//提现
public function withdraw()
{
+ $this->error('无法执行此操作');
//是否是会长
$this->purview();
//验证安全密码
@@ -414,7 +415,7 @@ class FinanceController extends BaseController
}
}
- $data = $model->field('id,widthdraw_number,create_time,settlement_end_time,sum_money,status,respond,transfer_proof')
+ $data = $model->field('id, widthdraw_number, create_time, settlement_begin_time, settlement_end_time, sum_money, status, respond, transfer_proof, op_id, op_type, last_op_id, last_op_type')
->where($map)
->order('id desc')
->page($page, $row)
@@ -426,8 +427,13 @@ class FinanceController extends BaseController
if (!empty($data)) {
foreach ($data as &$list) {
$list['create_time'] = date('Y-m-d H:i:s', $list['create_time']);
+ $list['settlement_begin_time'] = $list['settlement_begin_time'] ? date('Y-m-d H:i:s', $list['settlement_begin_time']) : '--';
$list['settlement_end_time'] = date('Y-m-d H:i:s', $list['settlement_end_time']);
$list['status_name'] = FinanceController::$withdrawStatus[$list['status']];
+ $list['op_id'] = $this->getOpIdByType($list['op_id'], $list['op_type']);
+ $list['last_op_id'] = $this->getOpIdByType($list['last_op_id'], $list['last_op_type']);
+ $list['op_type'] = getPromoteWithdrawOpType($list['op_type']);
+ $list['last_op_type'] = getPromoteWithdrawOpType($list['last_op_type']);
switch ($list['status']) {
case -2:
$list['status_name'] = '
' . $list['status_name'] . '';
@@ -454,6 +460,23 @@ class FinanceController extends BaseController
$this->display();
}
+ private function getOpIdByType($opId, $opType)
+ {
+ switch ($opType) {
+ case 1:
+ $opId = get_promote_name($opId);
+ break;
+ case 2:
+ $opId = getAdminNickname($opId);
+ break;
+ case 3:
+ $opId = '自动';
+ break;
+ }
+
+ return $opId;
+ }
+
//提现明细
public function withdrawDtl()
{
@@ -584,6 +607,7 @@ class FinanceController extends BaseController
//审核拒绝 重新审核
public function renewReview()
{
+ $this->error('无法执行此操作');
//是否是会长
$this->purview();
//验证安全密码
@@ -624,6 +648,7 @@ class FinanceController extends BaseController
//撤销提现
public function cancelWithdraw()
{
+ $this->error('无法执行此操作');
//是否是会长
$this->purview();
//验证安全密码
diff --git a/Application/Home/View/default/Finance/index.html b/Application/Home/View/default/Finance/index.html
index c85e547f4..39dc54177 100644
--- a/Application/Home/View/default/Finance/index.html
+++ b/Application/Home/View/default/Finance/index.html
@@ -35,7 +35,7 @@
{$meta_title}
diff --git a/Application/Home/View/default/Finance/withdrawRecord.html b/Application/Home/View/default/Finance/withdrawRecord.html
index 6ab8a8c20..7bd43e1ef 100644
--- a/Application/Home/View/default/Finance/withdrawRecord.html
+++ b/Application/Home/View/default/Finance/withdrawRecord.html
@@ -149,7 +149,12 @@
| 提现订单 |
提现日期 |
+ 结算开始日期 |
结算截止日期 |
+ 操作人 |
+ 操作人类型 |
+ 最后操作人 |
+ 最后操作人类型 |
收益金额 |
实际提现金额 |
提现状态 |
@@ -168,7 +173,12 @@
| {$vo.widthdraw_number} |
{$vo.create_time} |
+ {$vo.settlement_begin_time} |
{$vo.settlement_end_time} |
+ {$vo.op_id} |
+ {$vo.op_type} |
+ {$vo.last_op_id} |
+ {$vo.last_op_type} |
{$vo.sum_money} |
{$vo.sum_money} |
{$vo.status_name} |
@@ -178,11 +188,11 @@
汇款证明
- 重新审核
+
结算单
- 撤销提现
+
diff --git a/Data/update.sql b/Data/update.sql
index 391c988f2..12a8ead50 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -915,4 +915,16 @@ ADD COLUMN `beta_url` varchar(150) NOT NULL DEFAULT '' COMMENT 'Beta链接';
-- 游戏支付方式渠道配置
ALTER TABLE `tab_game`
-ADD COLUMN `pay_config` varchar(255) NOT NULL COMMENT '支付渠道 wx 微信 zfb 支付宝 quick 快捷 (gf 官方 sq 双乾';
\ No newline at end of file
+ADD COLUMN `pay_config` varchar(255) NOT NULL COMMENT '支付渠道 wx 微信 zfb 支付宝 quick 快捷 (gf 官方 sq 双乾';
+
+-- 2019-12-30
+-- 会长管理后台提现 cxj
+ALTER TABLE `tab_withdraw`
+ADD COLUMN `settlement_begin_time` int(10) NOT NULL DEFAULT 0 COMMENT '结算开始时间' AFTER `old_promote_account`;
+ALTER TABLE `tab_withdraw`
+ADD COLUMN `op_id` int(11) NOT NULL DEFAULT 0 COMMENT '操作id';
+ALTER TABLE `tab_withdraw`
+ADD COLUMN `op_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '操作人：1-推广员 2-管理员 3-自动';
+ALTER TABLE `tab_withdraw`
+ADD COLUMN `last_op_id` int(11) NOT NULL DEFAULT 0 COMMENT '最后操作人id',
+ADD COLUMN `last_op_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '最后操作人：1-推广员 2-管理员 3-自动';
\ No newline at end of file