og/Pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backup: 线上最终版本全量备份

Browse Source 
包含所有线上运行的改动:
- 代理编辑功能修复(码率/占成/返水率保存)
- CORS跨域修复(Pcapi构造函数统一Origin)
- 支付通道(ccpay/epay新增)
- 代理报表洗码量显示
- AlinPay金额调整
- 代理/会员编辑页面优化
- 多语言更新
This commit is contained in:
OG Backup
2026-06-14 14:19:49 +08:00
parent 490df4c4c5
commit 171f8fce5c
25 changed files with 1570 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/admin/controller/Agent.php
+4
View File
@@ -200,6 +200,9 @@ class Agent extends Common{
if( empty($pay_channel) ){
die(json_encode(['code'=>0,'msg'=>'请选择支付渠道']));
}
if( $agent_type == 2 && $pay_channel != 'OPR' ){
die(json_encode(['code'=>0,'msg'=>'人工上分模式只能选OPR渠道']));
}
if( !in_array($type_xima,[1,2]) ){
die(json_encode(['code'=>0,'msg'=>'洗码方式错误']));
}
@@ -433,6 +436,7 @@ class Agent extends Common{
$data['price_tc_ths'] = $price_tc_ths;
$data['price_tc_hjths'] = $price_tc_hjths;
$data['area_id'] = 3;
$data['referral_code'] = getRandCode();
// $data['agent_commission_tc'] = $agent_commission_tc;
// $data['agent_commission_tc_banker'] = $agent_commission_tc_banker;
application/admin/controller/Pcapi.php
+6 -9
View File
@@ -905,7 +905,6 @@ class Pcapi extends Controller{
//桌子信息
$table['boot_num'] = $boot['boot_num'];
$table['boot_id'] = $boot['id'];
$table['player_1_count'] = Db::connect('DB2')->name($numberTabTable)->where(array('table_id' => $table['id'], 'boot_id' => $boot['id'], 'win_player_1' => 1))->count();
$table['player_2_count'] = Db::connect('DB2')->name($numberTabTable)->where(array('table_id' => $table['id'], 'boot_id' => $boot['id'], 'win_player_2' => 1))->count();
$table['player_3_count'] = Db::connect('DB2')->name($numberTabTable)->where(array('table_id' => $table['id'], 'boot_id' => $boot['id'], 'win_player_3' => 1))->count();
@@ -1047,7 +1046,6 @@ class Pcapi extends Controller{
$boot = Db::connect('DB2')->name($bootTabTable)->where('table_id',$table['id'])->order('id DESC')->find();
if($boot){
$table['boot_num'] = $boot['boot_num'];
$table['boot_id'] = $boot['id'];
$table['player_1_count'] = Db::connect('DB2')->name($numberTabTable)->where(array('boot_id' => $boot['id'], 'win_player_1' => 1))->count();
$table['player_2_count'] = Db::connect('DB2')->name($numberTabTable)->where(array('boot_id' => $boot['id'], 'win_player_2' => 1))->count();
$table['player_3_count'] = Db::connect('DB2')->name($numberTabTable)->where(array('boot_id' => $boot['id'], 'win_player_3' => 1))->count();
@@ -1077,7 +1075,6 @@ class Pcapi extends Controller{
$table['bet_amount_msg']['banker_pair_amount'] = 0;
$table['bet_amount_msg']['player_pair_amount'] = 0;
$table['boot_num'] = $boot['boot_num'];
$table['boot_id'] = $boot['id'];
$table['palyerCount'] = Db::connect('DB2')->name($numberTabTable)->where(array('table_id' => $table['id'], 'boot_id' => $boot['id'], 'result' => 2))->count();
$table['tieCount'] = Db::connect('DB2')->name($numberTabTable)->where(array('table_id' => $table['id'], 'boot_id' => $boot['id'], 'result' => 3))->count();
$table['bankerCount'] = Db::connect('DB2')->name($numberTabTable)->where(array('table_id' => $table['id'], 'boot_id' => $boot['id'], 'result' => 1))->count();
@@ -1243,8 +1240,8 @@ class Pcapi extends Controller{
$startTime = mktime(0,0,0,date('m'),date('d')-1,date('Y'));
$endTime = mktime(0,0,0,date('m'),date('d'),date('Y'))-1;
}elseif($time_interval == 3){
$startTime = mktime(0,0,0,date("m"),date("d")-date("w")+1,date("Y"));
$endTime = mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y"));
$startTime = mktime(0,0,0,date("m"),date("d")-6,date("Y"));
$endTime = mktime(23,59,59,date("m"),date("d"),date("Y"));
}
$betWhere = array();
$betWhere['create_time'] = array('between',[$startTime,$endTime]);
@@ -1574,8 +1571,8 @@ class Pcapi extends Controller{
$startTime = mktime(0,0,0,date('m'),date('d')-1,date('Y'));
$endTime = mktime(0,0,0,date('m'),date('d'),date('Y'))-1;
}elseif($time_interval == 3){
$startTime = mktime(0,0,0,date("m"),date("d")-date("w")+1,date("Y"));
$endTime = mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y"));
$startTime = mktime(0,0,0,date("m"),date("d")-6,date("Y"));
$endTime = mktime(23,59,59,date("m"),date("d"),date("Y"));
}
$betWhere = array();
$betWhere['create_time'] = array('between',[$startTime,$endTime]);
@@ -1642,8 +1639,8 @@ class Pcapi extends Controller{
$startTime = mktime(0,0,0,date('m'),date('d')-1,date('Y'));
$endTime = mktime(0,0,0,date('m'),date('d'),date('Y'))-1;
}elseif($time_interval == 3){
$startTime = mktime(0,0,0,date("m"),date("d")-date("w")+1,date("Y"));
$endTime = mktime(23,59,59,date("m"),date("d")-date("w")+7,date("Y"));
$startTime = mktime(0,0,0,date("m"),date("d")-6,date("Y"));
$endTime = mktime(23,59,59,date("m"),date("d"),date("Y"));
}
$betWhere = array();
$betWhere['create_time'] = array('between',[$startTime,$endTime]);