Merge remote-tracking branch 'origin/dev' into dev

master
liuweiwen 5 years ago
commit 1b2cf94c9b

@ -1552,55 +1552,7 @@ class QueryController extends ThinkController
$this->display();
}
public function getPromoteSettlementType()
{
$promoteId = intval(I('post.promote_id', 0));
$settlementType = [];
if ($promoteId > 0) {
$promote = D('promote')->field('level, settlement_type')->where(array('id' => $promoteId))->find();
if (empty($promote) || $promote['level'] != 1 || empty($promote['settlement_type'])) {
$settlementType = [];
} else {
$settlementType = WithdrawModel::$settlementTypeList;
unset($settlementType[WithdrawModel::SETTLEMENT_TYPE_OTHER]);
if ($promote['settlement_type'] == 1) {
unset($settlementType[WithdrawModel::SETTLEMENT_TYPE_MONTH]);
} else {
unset($settlementType[WithdrawModel::SETTLEMENT_TYPE_WEEK]);
unset($settlementType[WithdrawModel::SETTLEMENT_TYPE_RECOUP]);
}
}
}
$this->ajaxReturn(['settlement_type' => $settlementType]);
}
public function getAmountBySettlementType()
{
$withdrawModel = new WithdrawModel();
$promoteId = intval(I('promote_id', 0));
$settlementType = intval(I('settlement_type', 0));
$time = I('time', '');
if (empty($promoteId) || !in_array($settlementType, [2, 3])) {
$this->ajaxReturn(['balance' => 0]);
}
$promote = M('promote', 'tab_')->find($promoteId);
if (empty($promote) || $promote['level'] != 1 || $promote['ver_status'] != 1 || empty($time)) {
$this->ajaxReturn(['balance' => 0]);
}
$data['begin_time'] = strtotime($time);
$data['end_time'] = strtotime('+1 month', $data['begin_time']) - 1;
if ($settlementType == 2) {
$balance = $withdrawModel->getMonthAmount($promote, $data);
} else {
$balance = $withdrawModel->getRecoupAmount($promote, $data);
}
$this->ajaxReturn(['balance' => $balance]);
}
public function getChannelStream() {
$map = [];
@ -1658,4 +1610,54 @@ class QueryController extends ThinkController
}
public function getPromoteSettlementType()
{
$promoteId = intval(I('post.promote_id', 0));
$settlementType = [];
if ($promoteId > 0) {
$promote = D('promote')->field('level, settlement_type')->where(array('id' => $promoteId))->find();
if (empty($promote) || $promote['level'] != 1 || empty($promote['settlement_type'])) {
$settlementType = [];
} else {
$settlementType = WithdrawModel::$settlementTypeList;
unset($settlementType[WithdrawModel::SETTLEMENT_TYPE_OTHER]);
if ($promote['settlement_type'] == 1) {
unset($settlementType[WithdrawModel::SETTLEMENT_TYPE_MONTH]);
} else {
unset($settlementType[WithdrawModel::SETTLEMENT_TYPE_WEEK]);
unset($settlementType[WithdrawModel::SETTLEMENT_TYPE_RECOUP]);
}
}
}
$this->ajaxReturn(['settlement_type' => $settlementType]);
}
public function getAmountBySettlementType()
{
$withdrawModel = new WithdrawModel();
$promoteId = intval(I('promote_id', 0));
$settlementType = intval(I('settlement_type', 0));
$time = I('time', '');
if (empty($promoteId) || !in_array($settlementType, [2, 3])) {
$this->ajaxReturn(['balance' => 0]);
}
$promote = M('promote', 'tab_')->find($promoteId);
if (empty($promote) || $promote['level'] != 1 || $promote['ver_status'] != 1 || empty($time)) {
$this->ajaxReturn(['balance' => 0]);
}
$data['begin_time'] = strtotime($time);
$data['end_time'] = strtotime('+1 month', $data['begin_time']) - 1;
if ($settlementType == 2) {
$balance = $withdrawModel->getMonthAmount($promote, $data);
} else {
$balance = $withdrawModel->getRecoupAmount($promote, $data);
}
$this->ajaxReturn(['balance' => $balance]);
}
}

@ -644,14 +644,23 @@
var sort = $(this).data("change");
var val = $(this).val();
var vdata = eval("DATAOBJ."+sort);//原先值
var dom = $(this);
if(!CHECK.number.test(val)){
layer.msg('结算单中的罚款和税率必须是数字');
$(this).val(0);
layer.msg('结算单中的罚款和税率必须是数字,且不能为空');
dom.val(vdata);
return false;
}
var str = "DATAOBJ."+sort+"='"+val+"';";
if(sort != 'fine'){
if(val > 100 || val < 0){
layer.msg('结算单中的税率不允许大于100和小于0');
dom.val(vdata);
return false;
}
eval(str);
var index = $(this).data("index");
var td = DATAOBJ.statement_info[index];

@ -456,91 +456,61 @@
}
})
},
deepCompare(x, y) {
var i, l, leftChain, rightChain;
function compare2Objects(x, y) {
var p;
if (isNaN(x) && isNaN(y) && typeof x === 'number' && typeof y === 'number') {
return true;
}
if (x === y) {
return true;
}
if ((typeof x === 'function' && typeof y === 'function') ||
(x instanceof Date && y instanceof Date) ||
(x instanceof RegExp && y instanceof RegExp) ||
(x instanceof String && y instanceof String) ||
(x instanceof Number && y instanceof Number)) {
return x.toString() === y.toString();
}
if (!(x instanceof Object && y instanceof Object)) {
return false;
}
if (x.isPrototypeOf(y) || y.isPrototypeOf(x)) {
return false;
}
if (x.constructor !== y.constructor) {
return false;
}
if (x.prototype !== y.prototype) {
return false;
}
if (leftChain.indexOf(x) > -1 || rightChain.indexOf(y) > -1) {
return false;
floatAdd(a,b){
return Math.round(a*100+b*100)/100;
},
floatCut(a,b){
return Math.round(a*100-b*100)/100;
},
CompanyKeyName:{
id:"公司表id",
partner:"公司名称",
link_man:'联系人',
link_phone:"联系电话",
address:'邮寄地址',
company_tax_no:'公司税号',
payee_name:'名称',
bank_account:"银行账号",
opening_bank:"开户行"
},
checkCompanyKey(type,key){
//获取公司名
var company = '';
if(key == "payee_name" || key == "bank_account" || key == "opening_bank"){
if((DATAOBJ.statement_type == 0 && type == "first_party_info") || (DATAOBJ.statement_type == 1 && type == "second_party_info")){
company = "收款方";
}
for (p in y) {
if (y.hasOwnProperty(p) !== x.hasOwnProperty(p)) {
return false;
} else if (typeof y[p] !== typeof x[p]) {
return false;
}
if((DATAOBJ.statement_type == 0 && type == "second_party_info")|| (DATAOBJ.statement_type == 1 && type == "first_party_info")){
company = "付款方";
}
for (p in x) {
if (y.hasOwnProperty(p) !== x.hasOwnProperty(p)) {
return false;
} else if (typeof y[p] !== typeof x[p]) {
return false;
}
switch (typeof (x[p])) {
case 'object':
case 'function':
leftChain.push(x);
rightChain.push(y);
if (!compare2Objects(x[p], y[p])) {
return false;
}
leftChain.pop();
rightChain.pop();
break;
default:
if (x[p] !== y[p]) {
return false;
}
break;
}
}else{
if(type == "first_party_info"){
company = "甲方";
}else{
company = "乙方";
}
return true;
}
if (arguments.length < 1) {
return true;
//获取键名
try {
var keyname = company+PUBLIC.CompanyKeyName[key];
} catch (error) {
var keyname = false;
}
for (i = 1, l = arguments.length; i < l; i++) {
leftChain = []; //Todo: this can be cached
rightChain = [];
if (!compare2Objects(arguments[0], arguments[i])) {
return false;
}
//验证
if(DATAOBJ[type][key] ===''){
layer.msg(keyname+"不能为空");
return false;
}
if(key == "link_phone" && !CHECK.mobile.test(DATAOBJ[type][key])){
layer.msg(keyname+"格式错误");
return false;
}
if(key == "bank_account" && !CHECK.BankNo.test(DATAOBJ[type][key])){
layer.msg(keyname+"格式错误");
return false;
}
return true;
}
},
}
//数据类
@ -570,37 +540,20 @@
}
//验证甲方信息
for (const key in DATAOBJ.first_party_info) {
var t = DATAOBJ.first_party_info;
if (t[key] === '') {
layer.msg('甲方信息不全,请先补全 code:' + key);
return false;
}
if (key == "link_phone" && !CHECK.mobile.test(t[key])) {
layer.msg('甲方联系人手机号格式错误');
return false;
}
if (key == "bank_account" && !CHECK.BankNo.test(t[key])) {
layer.msg('甲方银行卡号格式错误');
return false;
var t = DATAOBJ.first_party_info;
var flag = PUBLIC.checkCompanyKey("first_party_info",key);
if(!flag){
return flag;
}
}
//乙方
for (const key in DATAOBJ.second_party_info) {
var t = DATAOBJ.second_party_info;
if (!t[key] || t[key] == '') {
layer.msg('乙方信息不全,请先补全 code:' + key);
return false;
}
if (key == "link_phone" && !CHECK.mobile.test(t[key])) {
layer.msg('乙方联系人手机号格式错误');
return false;
}
if (key == "bank_account" && !CHECK.BankNo.test(t[key])) {
layer.msg('乙方银行卡号格式错误');
return false;
var t = DATAOBJ.second_party_info;
var flag = PUBLIC.checkCompanyKey("second_party_info",key);
if(!flag){
return flag;
}
}
console.log(DATAOBJ);
layer.load(2);
$("#createStatement").off("click");//自我解绑
@ -633,56 +586,67 @@
},
statementchange() {
$(".statementchange").off("blur");
$(".statementchange").on("blur", function () {
$(".statementchange").on("blur",function(){
var sort = $(this).data("change");
var val = $(this).val();
if (!CHECK.number.test(val)) {
layer.msg('结算单中的罚款和税率必须是数字');
$(this).val(0);
var vdata = eval("DATAOBJ."+sort);//原先值
var dom = $(this);
if(!CHECK.number.test(val)){
layer.msg('结算单中的罚款和税率必须是数字,且不能为空');
dom.val(vdata);
return false;
}
var str = "DATAOBJ." + sort + "='" + val + "';";
var str = "DATAOBJ."+sort+"='"+val+"';";
if (sort != 'fine') {
if(sort != 'fine'){
if(val > 100 || val < 0){
layer.msg('结算单中的税率不允许大于100和小于0');
dom.val(vdata);
return false;
}
eval(str);
var index = $(this).data("index");
var td = DATAOBJ.statement_info[index];
if ($(this).attr("name") == "first_ratio") {
td['second_ratio'] = 100 - val;
if( $(this).attr("name") == "first_ratio"){
td['second_ratio'] = 100-val;
}
if ($(this).attr("name") == "second_ratio") {
td['first_ratio'] = 100 - val;
if( $(this).attr("name") == "second_ratio"){
td['first_ratio'] = 100-val;
}
if (DATAOBJ.statement_type == 0) {
var ratio = td['first_ratio'] / 100;
} else {
var ratio = td['second_ratio'] / 100;
if(DATAOBJ.statement_type == 0){
var ratio = td['first_ratio']/100;
}else{
var ratio = td['second_ratio']/100;
}
DATAOBJ.statement_count['sum_money'] -= td['sum_money'];
td['sum_money'] = Math.floor((td['pay_amount'] * (100 - td['promote_ratio']) / 100 * ratio * (100 - td['fax_ratio']) / 100) * 100) / 100;
DATAOBJ.statement_count['sum_money'] += (td['sum_money'] - 0);
} else {
DATAOBJ.fine = Math.floor(DATAOBJ.fine * 100) / 100;
if (val > DATAOBJ.statement_count['sum_money']) {
DATAOBJ.statement_count['sum_money'] = PUBLIC.floatCut(DATAOBJ.statement_count['sum_money'],td['sum_money']);
td['sum_money'] = Math.round((td['pay_amount']*(100-td['promote_ratio'])/100*ratio*(100-td['fax_ratio'])/100)* 100) / 100 ;
DATAOBJ.statement_count['sum_money']=PUBLIC.floatAdd(DATAOBJ.statement_count['sum_money'],td['sum_money']);
}else{
DATAOBJ.fine = Math.round(DATAOBJ.fine * 100) / 100 ;
if(!CHECK.money.test(val)){
layer.msg('罚款金额格式错误');
$(this).val(DATAOBJ.fine);
return false;
}
if(val > DATAOBJ.statement_count['sum_money']){
layer.msg('罚款金额过大,总计不允许为负数');
$(this).val(DATAOBJ.fine);
return false;
}
DATAOBJ.statement_count['sum_money'] = (DATAOBJ.statement_count['sum_money'] - 0 + DATAOBJ.fine);
DATAOBJ.statement_count['pay_amount'] = (DATAOBJ.statement_count['pay_amount'] - 0 + DATAOBJ.fine);
console.log(str);
DATAOBJ.statement_count['sum_money'] =PUBLIC.floatAdd(DATAOBJ.statement_count['sum_money'],DATAOBJ.fine);
DATAOBJ.statement_count['pay_amount'] = PUBLIC.floatAdd(DATAOBJ.statement_count['pay_amount'],DATAOBJ.fine);
eval(str);
DATAOBJ.statement_count['sum_money'] = DATAOBJ.statement_count['sum_money'] - DATAOBJ.fine;
DATAOBJ.statement_count['pay_amount'] = DATAOBJ.statement_count['pay_amount'] - DATAOBJ.fine;
DATAOBJ.statement_count['sum_money'] =PUBLIC.floatCut(DATAOBJ.statement_count['sum_money'],DATAOBJ.fine);
DATAOBJ.statement_count['pay_amount'] = PUBLIC.floatCut(DATAOBJ.statement_count['pay_amount'],DATAOBJ.fine);
}
DATAOBJ.statement_count['pay_amount'] = Math.floor(DATAOBJ.statement_count['pay_amount'] * 100) / 100;
DATAOBJ.statement_count['sum_money'] = Math.floor(DATAOBJ.statement_count['sum_money'] * 100) / 100;
TPLSHOW.showStatementList(true);
})
}

@ -258,7 +258,9 @@
data = response.data;
console.log(data)
for (var i in data){
add += "<option company_id='"+data[i].company_id+"' value='"+data[i].company_id+"' "+('selected')+">"+data[i].company_name+"</option>"
if (data[i].company_id) {
add += "<option company_id='" + data[i].company_id + "' value='" + data[i].company_id + "' " + ('selected') + ">" + data[i].company_name + "</option>"
}
}
$("#company_name").empty();
$("#company_name").append(add);
@ -314,7 +316,7 @@
"<td class='sumAmount' data-value='"+sumAmount+"'>"+sumAmount+"</td>" +
"<td>-</td>" +
"<td>-</td>" +
"<td class='sumAll' data-value='"+sum+"'>"+sum+"</td>" +
"<td class='sumAll' data-value='"+sum.toFixed(2)+"'>"+sum.toFixed(2)+"</td>" +
"</tr>"+
"<tr><td colspan='3'>\n" +
"本月分成总金额(人民币大写)</td>" +
@ -336,7 +338,7 @@
console.log(ext_field);
$("tbody").empty();
$("#company_name").val("");
// $("#company_name").val("");
$("#settlement_type").text("");
$("#bank_card").val("");
$("#account_openin").val("");
@ -358,7 +360,7 @@
success:function(data){
console.log($("#company_name option:selected").attr('company-type'))
$("#company_name").val(data.data.company_name);
// $("#company_name").val(data.data.company_name);
$("#settlement_type").text(data.data.settlement_type);
$("#bank_card").val(data.data.bank_card);
$("#account_openin").val(data.data.account_openin);
@ -377,10 +379,14 @@
dataType: 'json',
success: function (response) {
add +='<option value="">体现单号</option>';
data = response.data;
console.log(data)
for (var i in data){
add += "<option value='"+data[i].widthdraw_number+"' "+('selected')+">"+data[i].widthdraw_number+"</option>"
var datas = response.data;
var widthdrawNumber = datas[0].widthdraw_number;
console.log(datas)
for (var i in datas){
add += "<option value='"+datas[i].widthdraw_number+"' "+(datas[i].widthdraw_number == widthdrawNumber?'selected':'')+">"+datas[i].widthdraw_number+"</option>"
}
$("#ext_field").empty();
$("#ext_field").append(add);

@ -330,13 +330,13 @@ class BaseController extends HomeController
case 'Home/Promote/index':
break;
case 'Home/Safe/verifyPassword':
break;
break;
case 'Home/Safe/safeDocument':
break;
case 'Home/Promote/popRuleDetail':
break;
case 'Home/Promote/popRuleDetail':
break;
case 'Home/Promote/popRuleFinish':
break;
break;
default:
$this->tips($status,U('Safe/modifyBaseInfo'));
break;

@ -277,12 +277,12 @@
<div class="blue-btn" onclick="layer.msg('已售空,我们正在努力上货中~');">beta版下载</div>
<?php endif;?>
<div class="gray-btn down-link" down-link="{$downloadUrl}">普通下载</div>
<div class="blue-btn down-link" down-link="{$downloadUrl}">普通下载</div>
<?php else:?>
<div class="blue-btn" onclick="layer.msg('该游戏已关闭下载');">¥10至尊下载</div>
<div class="blue-btn" onclick="layer.msg('该游戏已关闭下载');">beta版下载</div>
<div class="gray-btn down-link" onclick="layer.msg('该游戏已关闭下载');return false;" down-link="{$downloadUrl}">普通下载</div>
<div class="blue-btn down-link" onclick="layer.msg('该游戏已关闭下载');return false;" down-link="{$downloadUrl}">普通下载</div>
<?php endif;?>
</div>
</div>

@ -206,23 +206,6 @@
<script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
<script>
var tips = '{$tips}'
var message = '{$message}'
if(tips == 1) {
layer.open({
type: 1,
title: "提示",
area:['300px'],
closeBtn: 1,
shadeClose: true,
skin: 'yourclass',
btn:['确认','返回'],
content: '<div style="height:60px;display:flex;justify-content:center;align-content:center;align-items:center;">'+message+'</div>',
end:function(){window.location.href="{:U('Promote/index')}";},
yes:function(){window.location.href="{:U('Safe/modifyBaseInfo')}"},
});
}
var pop_ids = {$match_rules_id};
function pop_rulus_content(id, force = false)
{
@ -264,6 +247,24 @@
else
return null;
}
var tips = '{$tips}'
var message = '{$message}'
if(tips == 1) {
layer.open({
type: 1,
title: "提示",
area:['300px'],
closeBtn: 1,
shadeClose: true,
skin: 'yourclass',
btn:['确认','返回'],
content: '<div style="height:60px;display:flex;justify-content:center;align-content:center;align-items:center;">'+message+'</div>',
end:function(){window.location.href="{:U('Promote/index')}";},
yes:function(){window.location.href="{:U('Safe/modifyBaseInfo')}"},
});
}
$(function(){
$(".select_gallery").select2();
$('.icon').each(function() {

@ -917,23 +917,6 @@ 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 双乾';
-- 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-自动';
-- 2019-12-31
-- 推广员结算类型 cxj
ALTER TABLE `tab_promote`
ADD COLUMN `settlement_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '结算类型1-周结 2-月结';
ALTER TABLE tab_promote add `company_belong` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会归属0-内团1-外团';
ALTER TABLE tab_promote add `company_relation` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会关系0-自主开发及维护1-只维护';
-- 游戏的合作方新增联系人,联系电话,邮寄地址,公司税号,收款方名称,银行账号,开户行 liuweiwen 2020-01-03
@ -1033,20 +1016,51 @@ CREATE TABLE `tab_cp_game_ratio` (
-- 玩家列表账户锁定添加备注 2020-01-09 郑昌隆
ALTER TABLE `tab_user` ADD COLUMN `lock_remark` varchar(512) NOT NULL DEFAULT '' COMMENT '账号锁定原因' after lock_status;
-- 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-自动';
-- 平台规则
CREATE TABLE `sys_document_pop_rules` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '平台规则表',
`title` varchar(100) COLLATE utf8mb4_bin NOT NULL DEFAULT '',
`desc` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '描述',
`content` text COLLATE utf8mb4_bin,
`sort` smallint(3) unsigned NOT NULL DEFAULT '0' COMMENT '权重',
`type` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '类型 0不弹窗 1弹出单次 2循环弹出',
`pop_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '弹窗时间',
`operate_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '操作时间',
`operater_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '操作者ID',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-- 2019-12-31
-- 推广员结算类型 cxj
ALTER TABLE `tab_promote`
ADD COLUMN `settlement_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '结算类型1-周结 2-月结';
ALTER TABLE tab_promote add `company_belong` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会归属0-内团1-外团';
ALTER TABLE tab_promote add `company_relation` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会关系0-自主开发及维护1-只维护';
-- 2020-01-02
-- 提现结算类型 cxj
ALTER TABLE `tab_withdraw`
ADD COLUMN `settlement_type` tinyint(3) NOT NULL DEFAULT 3 COMMENT '结算类型1-周结 2-月结 3-管理员提现 4-推广员提现 5-其他';
-- 2020 01-03 cxj
ALTER TABLE `sys_file`
MODIFY COLUMN `mime` char(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '文件mime类型';
ALTER TABLE `tab_spend`
MODIFY COLUMN `selle_status` int(11) NOT NULL DEFAULT 0 COMMENT '渠道结算 0未结算1 结算',
MODIFY COLUMN `selle_ratio` double(5, 2) DEFAULT 0.00 COMMENT '渠道分成比例';
-- 2020 01-06 cxj
ALTER TABLE `tab_promote_game_ratio`
ADD COLUMN `turnover_ratio` varchar(2000) NOT NULL COMMENT '流水分成比例' AFTER `last_ratio_status`;
ALTER TABLE `tab_promote_game_ratio`
ADD COLUMN `last_turnover_ratio` varchar(2000) NOT NULL COMMENT '上次流水分成比例' AFTER `turnover_ratio`;
-- 2020 01-07 cxj
ALTER TABLE `tab_withdraw`
ADD COLUMN `game_ratio` varchar(5000) NOT NULL COMMENT '游戏提现实际分成比例';
ALTER TABLE `tab_withdraw`
MODIFY COLUMN `settlement_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '结算类型1-周结 2-月结 9-其他';
-- 2020 01-13
-- 公会分成比例申请记录
@ -1070,3 +1084,17 @@ CREATE TABLE `tab_promote_game_ratio_log` (
PRIMARY KEY (`id`),
KEY `promote_id` (`promote_id`,`game_id`,`status`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-- 平台规则
CREATE TABLE `sys_document_pop_rules` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '平台规则表',
`title` varchar(100) COLLATE utf8mb4_bin NOT NULL DEFAULT '',
`desc` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '描述',
`content` text COLLATE utf8mb4_bin,
`sort` smallint(3) unsigned NOT NULL DEFAULT '0' COMMENT '权重',
`type` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '类型 0不弹窗 1弹出单次 2循环弹出',
`pop_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '弹窗时间',
`operate_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '操作时间',
`operater_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '操作者ID',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

Loading…
Cancel
Save