backup: 线上最终版本全量备份
包含所有线上运行的改动: - 代理编辑功能修复(码率/占成/返水率保存) - CORS跨域修复(Pcapi构造函数统一Origin) - 支付通道(ccpay/epay新增) - 代理报表洗码量显示 - AlinPay金额调整 - 代理/会员编辑页面优化 - 多语言更新
This commit is contained in:
OG Backup
@@ -565,12 +565,24 @@ class Agent Extends Common{
|
||||
if(!$user || $user['agent'] == 0){
|
||||
die(json_encode(['code'=>0,'msg'=>$lang['error_id']]));
|
||||
}
|
||||
// 顶级代理(agent_parent_id=0)无真实上级：构造一个不设限的虚拟上级，使所有"不得高于上级"封顶校验自动放行；
|
||||
// "不得低于下级"封底校验与写入逻辑保持不变(顶级代理仍受其下级最高费率约束)。
|
||||
if($parent_id <= 0){
|
||||
die(json_encode(['code'=>0,'msg'=>$lang['parent_error']]));
|
||||
}
|
||||
$agentParent = Db::name('user')->where('id',$parent_id)->find();
|
||||
if(!$agentParent || $agentParent['agent'] == 0){
|
||||
die(json_encode(['code'=>0,'msg'=>$lang['parent_error']]));
|
||||
$agentParent = [
|
||||
'limit_low' => 0, 'limit_high' => 99999999999,
|
||||
'limit_low_tie' => 0, 'limit_high_tie' => 99999999999,
|
||||
'limit_low_pair' => 0, 'limit_high_pair' => 99999999999,
|
||||
'limit_low_nn' => 0, 'limit_high_nn' => 0,
|
||||
'agent_ximalv' => 100, 'agent_ximalv_dt' => 100,
|
||||
'agent_ximalv_nn' => 100, 'agent_ximalv_tc' => 100,
|
||||
'agent_cs' => 100, 'rebate_rate' => 100,
|
||||
'agent_parent_id' => 0,
|
||||
];
|
||||
}else{
|
||||
$agentParent = Db::name('user')->where('id',$parent_id)->find();
|
||||
if(!$agentParent || $agentParent['agent'] == 0){
|
||||
die(json_encode(['code'=>0,'msg'=>$lang['parent_error']]));
|
||||
}
|
||||
}
|
||||
if(!$nickname){
|
||||
die(json_encode(['code'=>0,'msg'=>$lang['empty_nickname']]));
|
||||
@@ -682,6 +694,38 @@ class Agent Extends Common{
|
||||
die(json_encode(['code'=>0,'msg'=>$lang['rebate_cannot_lower_agent'].' '.$childMaxRebateRate.'%']));
|
||||
}
|
||||
|
||||
// —— 时序风险检测 ——
|
||||
// 洗码率/返水率/占成率在「下注未结算」期间被修改，结算(openingBet)会按新值参与代理分账，
|
||||
// 导致本局佣金与下注时预期不符。仅当上述费率确有变化、且该代理下级存在未结算注单时，要求二次确认。
|
||||
// 限红(limit_*)不参与结算、赔率(price_*)代理端只读，故不在检测范围。
|
||||
$confirm_pending = Request::instance()->post('confirm_pending');
|
||||
$rateChanged = (
|
||||
abs($agent_ximalv - (float)$user['agent_ximalv']) > 0.001 ||
|
||||
abs($agent_ximalv_dt - (float)$user['agent_ximalv_dt']) > 0.001 ||
|
||||
abs($agent_ximalv_nn - (float)$user['agent_ximalv_nn']) > 0.001 ||
|
||||
abs($agent_ximalv_tc - (float)$user['agent_ximalv_tc']) > 0.001 ||
|
||||
abs($agent_cs - (float)$user['agent_cs']) > 0.001 ||
|
||||
abs((float)$rebate_rate - (float)$user['rebate_rate']) > 0.001
|
||||
);
|
||||
if($rateChanged && !$confirm_pending){
|
||||
// bet 表位于 DB2 连接(与 Report 模块一致)；下级注单路径匹配沿用全站约定的两段 LIKE。
|
||||
// create_time 限定近 1 小时，规避历史异常残留的 is_end=0 注单造成的误报。
|
||||
$pendingCount = Db::connect('DB2')->name('bet')
|
||||
->where('is_end', 0)
|
||||
->where('create_time', '>=', time() - 3600)
|
||||
->where(function($q) use ($user_id){
|
||||
$q->where('agent_parent_id_path', 'like', '%,'.$user_id.',%')
|
||||
->whereOr('agent_parent_id_path', 'like', $user_id.',%');
|
||||
})
|
||||
->count();
|
||||
if($pendingCount > 0){
|
||||
die(json_encode([
|
||||
'code' => 2,
|
||||
'pending' => $pendingCount,
|
||||
'msg' => '该代理下级当前有 '.$pendingCount.' 笔注单尚未结算。本次修改的洗码率 / 返水率 / 占成率将按新值参与这些注单的代理分账，可能使本局佣金与下注时预期不符。确定仍要立即保存吗？',
|
||||
]));
|
||||
}
|
||||
}
|
||||
|
||||
// 拼装数据创建代理
|
||||
$user_data = array();
|
||||
|
||||
@@ -260,13 +260,13 @@ class Login extends Controller {
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
}
|
||||
$where = array();
|
||||
|
||||
@@ -760,9 +760,7 @@ class Player Extends Common{
|
||||
$user_data['agent_ximalv_nn'] = $agent_ximalv_nn;
|
||||
$user_data['agent_ximalv_tc'] = $agent_ximalv_tc;
|
||||
$user_data['manager_id'] = $manager_id;
|
||||
if ($rebate_rate){
|
||||
$user_data['rebate_rate'] = $rebate_rate;
|
||||
}
|
||||
$user_data['rebate_rate'] = $rebate_rate ?: 0;
|
||||
$user_data['update_time'] = time();
|
||||
$user_data['remarks'] = $remark;
|
||||
$result = Db::name('user')->where('id',$user_id)->update($user_data);
|
||||
|
||||
@@ -36,17 +36,17 @@ class Report Extends Common{
|
||||
$game_id = intval(Request::instance()->get('game_id'));
|
||||
$export = intval(Request::instance()->get('export'));
|
||||
|
||||
// 转换日期时间（默认：今天07:00:00 ~ 明天06:59:59）
|
||||
// 转换日期时间（默认：今天08:00:00 ~ 明天07:59:59）
|
||||
if ($startDate) {
|
||||
$startTime = strtotime($startDate);
|
||||
} else {
|
||||
$startTime = strtotime(date('Y-m-d') . ' 07:00:00');
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||
}
|
||||
if ($endDate) {
|
||||
$endTime = strtotime($endDate);
|
||||
} else {
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 06:59:59');
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||
}
|
||||
|
||||
@@ -309,14 +309,14 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
@@ -505,13 +505,13 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
}
|
||||
|
||||
@@ -1032,13 +1032,13 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
}
|
||||
|
||||
@@ -2054,14 +2054,14 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
@@ -2172,14 +2172,14 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
@@ -2269,14 +2269,14 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
@@ -2819,14 +2819,14 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
@@ -2869,13 +2869,13 @@ class Report Extends Common{
|
||||
if ($startDate) {
|
||||
$startTime = strtotime($startDate);
|
||||
} else {
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||
}
|
||||
if ($endDate) {
|
||||
$endTime = strtotime($endDate);
|
||||
} else {
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||
}
|
||||
|
||||
@@ -3075,14 +3075,14 @@ class Report Extends Common{
|
||||
if ($startDate) {
|
||||
$startTime = strtotime($startDate);
|
||||
} else {
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
if ($endDate) {
|
||||
$endTime = strtotime($endDate);
|
||||
} else {
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
@@ -3168,14 +3168,14 @@ class Report Extends Common{
|
||||
if ($startDate) {
|
||||
$startTime = strtotime($startDate);
|
||||
} else {
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
if ($endDate) {
|
||||
$endTime = strtotime($endDate);
|
||||
} else {
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
@@ -3275,14 +3275,14 @@ class Report Extends Common{
|
||||
if ($startDate) {
|
||||
$startTime = strtotime($startDate);
|
||||
} else {
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
if ($endDate) {
|
||||
$endTime = strtotime($endDate);
|
||||
} else {
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
@@ -3366,14 +3366,14 @@ class Report Extends Common{
|
||||
if ($startDate) {
|
||||
$startTime = strtotime($startDate);
|
||||
} else {
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
if ($endDate) {
|
||||
$endTime = strtotime($endDate);
|
||||
} else {
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
@@ -3479,14 +3479,14 @@ class Report Extends Common{
|
||||
if ($startDate) {
|
||||
$startTime = strtotime($startDate);
|
||||
} else {
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
if ($endDate) {
|
||||
$endTime = strtotime($endDate);
|
||||
} else {
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
@@ -3574,14 +3574,14 @@ class Report Extends Common{
|
||||
if ($startDate) {
|
||||
$startTime = strtotime($startDate);
|
||||
} else {
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s', $startTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
if ($endDate) {
|
||||
$endTime = strtotime($endDate);
|
||||
} else {
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s', $endTime);
|
||||
$this->assign('get', $get);
|
||||
}
|
||||
@@ -3683,14 +3683,14 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
@@ -3895,14 +3895,14 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
@@ -3994,14 +3994,14 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
@@ -4100,14 +4100,14 @@ class Report Extends Common{
|
||||
if($startDate){
|
||||
$startTime = strtotime($startDate);
|
||||
}else{
|
||||
$startTime = strtotime(date('Y-m-d'));
|
||||
$startTime = strtotime(date('Y-m-d') . ' 08:00:00');
|
||||
$get['startDate'] = date('Y-m-d H:i:s',$startTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
if($endDate){
|
||||
$endTime = strtotime($endDate);
|
||||
}else{
|
||||
$endTime = time();
|
||||
$endTime = strtotime(date('Y-m-d', strtotime('+1 day')) . ' 07:59:59');
|
||||
$get['endDate'] = date('Y-m-d H:i:s',$endTime);
|
||||
$this->assign('get',$get);
|
||||
}
|
||||
|
||||
@@ -30,12 +30,12 @@ class Settle Extends Common{
|
||||
if($timeLength == 1 || $timeLength == 2){
|
||||
if($timeLength == 1){
|
||||
//上周时间
|
||||
$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-date("w")+1-7,date("Y")));
|
||||
$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-date("w")+7-7,date("Y")));
|
||||
$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-(date("w")?:7)+1-7,date("Y")));
|
||||
$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7-7,date("Y")));
|
||||
}elseif($timeLength == 2){
|
||||
//本周时间
|
||||
$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-date("w")+1,date("Y")));
|
||||
$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")));
|
||||
$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-(date("w")?:7)+1,date("Y")));
|
||||
$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")));
|
||||
}
|
||||
$startTime = strtotime($weekStart);
|
||||
$endTime = strtotime($weekEnd);
|
||||
@@ -474,12 +474,12 @@ class Settle Extends Common{
|
||||
if($timeLength == 1 || $timeLength == 2){
|
||||
if($timeLength == 1){
|
||||
//上周时间
|
||||
$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-date("w")+1-7,date("Y")));
|
||||
$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-date("w")+7-7,date("Y")));
|
||||
$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-(date("w")?:7)+1-7,date("Y")));
|
||||
$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7-7,date("Y")));
|
||||
}elseif($timeLength == 2){
|
||||
//本周时间
|
||||
$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-date("w")+1,date("Y")));
|
||||
$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y")));
|
||||
$weekStart = date("Y-m-d H:i:s",mktime(0, 0 , 0,date("m"),date("d")-(date("w")?:7)+1,date("Y")));
|
||||
$weekEnd = date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-(date("w")?:7)+7,date("Y")));
|
||||
}
|
||||
$startTime = strtotime($weekStart);
|
||||
$endTime = strtotime($weekEnd);
|
||||
|
||||
@@ -301,7 +301,7 @@ return [
|
||||
'betting_money' => 'Bet money',
|
||||
'code_washing_amount' => 'Code washing amount',
|
||||
'odd_code_fee' => 'Odd code fee',
|
||||
'code_amount' => 'Code amount',
|
||||
'code_amount' => 'Rebate',
|
||||
'settled_code_amount' => 'Settled code amount',
|
||||
'unsettled_code_amount' => 'Unsettled code amount',
|
||||
'unsettled_rebate_amount' => 'Unsettled rebate amount',
|
||||
|
||||
@@ -301,7 +301,7 @@ return [
|
||||
'betting_money' => '下注金额',
|
||||
'code_washing_amount' => '洗码量',
|
||||
'odd_code_fee' => '注单码费',
|
||||
'code_amount' => '码量',
|
||||
'code_amount' => '码粮',
|
||||
'settled_code_amount' => '已结码量',
|
||||
'unsettled_code_amount' => '未结码量',
|
||||
'unsettled_rebate_amount' => '未结返水',
|
||||
|
||||
@@ -301,7 +301,7 @@ return [
|
||||
'betting_money' => '下注金額',
|
||||
'code_washing_amount' => '洗碼量',
|
||||
'odd_code_fee' => '注單碼費',
|
||||
'code_amount' => '碼量',
|
||||
'code_amount' => '碼糧',
|
||||
'settled_code_amount' => '已結碼量',
|
||||
'unsettled_code_amount' => '未結碼量',
|
||||
'unsettled_rebate_amount' => '未結返水',
|
||||
|
||||
@@ -269,7 +269,12 @@
|
||||
dataType: 'JSON',
|
||||
success: function (data) {
|
||||
if (data.code == 0) {
|
||||
layer.msg(data.msg);
|
||||
// 校验未通过：用必须点确认的弹窗代替一闪而过的 toast，确保操作员看清失败原因
|
||||
// (如返水率/码率/占股超过上级上限时，后端会返回具体上限值)
|
||||
layer.alert(data.msg, {
|
||||
title: lang.message,
|
||||
icon: 0
|
||||
});
|
||||
} else if (data.code == 1) {
|
||||
layer.alert(data.msg,{
|
||||
title:lang.message,
|
||||
@@ -277,6 +282,36 @@
|
||||
x_admin_close();
|
||||
parent.location.reload();
|
||||
});
|
||||
} else if (data.code == 2) {
|
||||
// 时序风险：下级有未结算注单，二次确认后带 confirm_pending 重新提交
|
||||
layer.confirm(data.msg, {
|
||||
title: lang.message,
|
||||
btn: ['确定保存', '取消']
|
||||
}, function (idx) {
|
||||
layer.close(idx);
|
||||
query.confirm_pending = 1;
|
||||
$.ajax({
|
||||
url: '/agent/do_edit',
|
||||
data: query,
|
||||
type: 'POST',
|
||||
dataType: 'JSON',
|
||||
success: function (d) {
|
||||
if (d.code == 0) {
|
||||
layer.alert(d.msg, {
|
||||
title: lang.message,
|
||||
icon: 0
|
||||
});
|
||||
} else if (d.code == 1) {
|
||||
layer.alert(d.msg, {
|
||||
title: lang.message
|
||||
}, function () {
|
||||
x_admin_close();
|
||||
parent.location.reload();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
@@ -644,13 +644,11 @@
|
||||
//query.mobile = $('#mobile').val();
|
||||
//query.bet_type = $('#bet_type').val();
|
||||
query.win_limit = $('#win_limit').val();
|
||||
/*
|
||||
query.agent_commission = $('#agent_commission').val();
|
||||
query.agent_commission_dt = $('#agent_commission_dt').val();
|
||||
query.agent_commission_nn = $('#agent_commission_nn').val();
|
||||
query.agent_commission_tc = $('#agent_commission_tc').val();
|
||||
query.agent_commission_tc_banker = $('#agent_commission_tc_banker').val();
|
||||
*/
|
||||
query.limit_low = $('#limit_low').val();
|
||||
query.limit_high = $('#limit_high').val();
|
||||
query.limit_low_tie = $('#limit_low_tie').val();
|
||||
|
||||
@@ -77,7 +77,10 @@
|
||||
<div class="gap">
|
||||
<button class="layui-btn search-btn" id="search" onclick="showShadow()">{$lang['search']}</button>
|
||||
<a class="layui-btn search-btn" onclick="showShadow()" href="javascript:location.replace(location.href);">{$lang['refresh']}</a>
|
||||
<button class="layui-btn search-btn countDown">5</button>
|
||||
<label style="margin-left:6px;line-height:38px;cursor:pointer;font-weight:normal;vertical-align:middle;">
|
||||
<input type="checkbox" id="autoRefresh" style="vertical-align:middle;"> 自动刷新
|
||||
</label>
|
||||
<button type="button" class="layui-btn search-btn countDown" style="display:none;">10</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@@ -187,16 +190,44 @@
|
||||
$(function(){
|
||||
var online = $('#online').val();
|
||||
var refreshUrl = $('#refreshUrl').val();
|
||||
var countDown = 10;
|
||||
if(online == 1){
|
||||
$('.countDown').show();
|
||||
setInterval(function(){
|
||||
var INTERVAL = 10; // 自动刷新间隔(秒)
|
||||
var countDown = INTERVAL;
|
||||
var autoTimer = null;
|
||||
|
||||
function startAuto(reloadFn){
|
||||
countDown = INTERVAL;
|
||||
$('.countDown').show().html(countDown);
|
||||
autoTimer = setInterval(function(){
|
||||
countDown = countDown - 1;
|
||||
$('.countDown').html(countDown);
|
||||
if(countDown == 0){
|
||||
location.href = refreshUrl;
|
||||
if(countDown <= 0){
|
||||
reloadFn();
|
||||
}
|
||||
},1000);
|
||||
}, 1000);
|
||||
}
|
||||
function stopAuto(){
|
||||
if(autoTimer){ clearInterval(autoTimer); autoTimer = null; }
|
||||
$('.countDown').hide();
|
||||
}
|
||||
|
||||
if(online == 1){
|
||||
// 从“在线管理”进入：保持原有自动刷新行为
|
||||
startAuto(function(){ location.href = refreshUrl; });
|
||||
}else{
|
||||
// 注单查询：可开关的今日实时自动刷新(默认开,刷新当前查询条件)
|
||||
var saved = localStorage.getItem('bet_auto_refresh');
|
||||
var enabled = (saved === null) ? true : (saved === '1');
|
||||
$('#autoRefresh').prop('checked', enabled);
|
||||
if(enabled){ startAuto(function(){ location.replace(location.href); }); }
|
||||
$('#autoRefresh').on('change', function(){
|
||||
if($(this).is(':checked')){
|
||||
localStorage.setItem('bet_auto_refresh','1');
|
||||
startAuto(function(){ location.replace(location.href); });
|
||||
}else{
|
||||
localStorage.setItem('bet_auto_refresh','0');
|
||||
stopAuto();
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user