+ | *会长账号： |
+
|
{$data.widthdraw_number} |
{$data.sum_money} |
-
-
- {: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'])} |
- {:getPromoteWithdrawSettlementType($data['settlement_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',###}--- |
- style="color: #999;">{:promoteWithdrawStatus($data['status'])} |
+ {$data.company_name} |
+ {$data.promote_account} |
+ {$data.op_id_text} |
+ {$data.op_type_text} |
+ {$data.last_op_id_text} |
+ {$data.last_op_type_text} |
+ {$data.settlement_type_text} |
+ {$data.settlement_begin_time} |
+ {$data.settlement_end_time} |
+ {$data.create_time} |
+ {$data.status_text} |
{$data.respond} |
- {$data.audit_time|date='Y-m-d H:i:s',###}--- |
+ {$data.audit_time} |
diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html
new file mode 100644
index 000000000..e045ca3e6
--- /dev/null
+++ b/Application/Admin/View/StatementMangement/rewardManageList.html
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 奖罚类型 |
+ 公司类型 |
+ 公司名称 |
+ 涉及账号 |
+ 游戏 |
+ 事件 |
+ 金额 |
+ 备注 |
+ 添加人 |
+ 操作 |
+
+
+
+
+
+
+
+ | aOh! 暂时还没有内容! |
+
+
+
+
+
+ | {$data.reward_type_desc} |
+ {$data.company_type_desc} |
+ {$data.company_name} |
+
+
+
+ 推广员/玩家/{$account['account']}
+
+
+ |
+ {$data.relation_game_name} |
+ {$data.content} |
+ {$data.money} |
+ {$data.remark} |
+ {:get_admin_nickname($data['creater_id'])} |
+
+ 编辑
+ 删除
+ |
+
+
+
+
+
+
+
+
+ {$_page|default=''}
+
+
+
+
+
+
+
+ if(C('COLOR_STYLE')=='blue_color') echo '
+
+ ';
+
+
+
+
+
+
+
+
diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html
new file mode 100644
index 000000000..1cbf4feba
--- /dev/null
+++ b/Application/Admin/View/StatementMangement/rewardManageSave.html
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php
index 5f064edc8..a104b86c1 100644
--- a/Application/Common/Common/function.php
+++ b/Application/Common/Common/function.php
@@ -1455,3 +1455,21 @@ function getPromoteWithdrawSettlementType($type = null)
return Admin\Model\WithdrawModel::$settlementTypeList;
}
}
+
+//获取推广公司列表
+function getPromoteCompanys()
+{
+ return M('promote_company', 'tab_')->field('id, company_name')->where(['status' => 1])->select();
+}
+
+function getPromoteCompanyName($companyId)
+{
+ $companyName = M('promote_company', 'tab_')->where(['id' => $companyId])->getField('company_name');
+
+ return $companyName ?? '未知';
+}
+
+function getGameTypes()
+{
+ return M('game_type', 'tab_')->field('id, type_name')->where(['status' => 1])->select();
+}
\ No newline at end of file
diff --git a/Data/update.sql b/Data/update.sql
index 149fe0fee..c9e399ee7 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1106,6 +1106,30 @@ ADD COLUMN `can_view_recharge` tinyint(1) NOT NULL default 0 COMMENT '是否显
ALTER TABLE `tab_cp_game_ratio`
ADD COLUMN `instanceof` tinyint(2) NOT NULL DEFAULT 1 COMMENT '运算符（1:>= ; 2:>）' AFTER `game_id`;
+-- 2020-02-04
+ALTER TABLE `tab_promote`
+ADD COLUMN `auto_review_withdraw_status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '提现自动审核状态：0-关闭 1-开启';
+ALTER TABLE `tab_promote`
+ADD COLUMN `auto_review_withdraw_updated_time` int(10) NOT NULL DEFAULT 0 COMMENT '提现自动审核状态更新时间';
+ALTER TABLE `tab_promote`
+ADD INDEX `auto_review_withdraw_status`(`auto_review_withdraw_status`) USING BTREE;
+
+-- 奖罚记录
+CREATE TABLE `tab_reward_record` (
+ `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `reward_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '奖罚类型 1奖励 2惩罚',
+ `company_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '公司类型 1上游公司 2下游公司',
+ `company_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '公司ID 当公司类型为上游CP公司时，展示合作方管理下的公司，反之展示推广公司管理下的公司',
+ `accounts` json NOT NULL,
+ `relation_game_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '游戏id',
+ `content` varchar(1000) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '事件内容',
+ `money` double(11,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '金额',
+ `remark` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '备注',
+ `create_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
+ `creater_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建者ID',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
CREATE TABLE `tab_company_info` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
`partner` varchar(60) NOT NULL COMMENT '合作方名称',
|