backup: 线上最终版本全量备份
包含所有线上运行的改动: - 代理编辑功能修复(码率/占成/返水率保存) - CORS跨域修复(Pcapi构造函数统一Origin) - 支付通道(ccpay/epay新增) - 代理报表洗码量显示 - AlinPay金额调整 - 代理/会员编辑页面优化 - 多语言更新
This commit is contained in:
@@ -14,6 +14,8 @@ class Order Extends Controller{
|
||||
use traits\happyPay;
|
||||
use traits\hengfuPay;
|
||||
use traits\alinPay;
|
||||
use traits\epayPay;
|
||||
use traits\ccpayPay;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
@@ -34,10 +36,23 @@ class Order Extends Controller{
|
||||
}
|
||||
$pay_method = $area_list[$user['area_id']]['pay'];
|
||||
if($user && $user['api_token'] == $api_token){
|
||||
$this->assign('online_order_fac',$pay_list[$pay_method]['online_order_fac']);
|
||||
$this->assign('payMethod',$pay_list[$pay_method]['type']);
|
||||
$this->assign('client',1);
|
||||
$this->assign('user_info',$user);
|
||||
$payMethod = $pay_list[$pay_method]['type'];
|
||||
$pay_routes = [];
|
||||
foreach($payMethod as $k => $v){
|
||||
$pay_routes[$k] = $pay_list[$pay_method]['online_order_fac'];
|
||||
}
|
||||
// 越南地区追加 USDT (Epay)
|
||||
if($user['area_id'] == 3 && !empty($pay_list['epay']['type'])){
|
||||
foreach($pay_list['epay']['type'] as $k => $v){
|
||||
$payMethod[$k] = $v;
|
||||
$pay_routes[$k] = $pay_list['epay']['online_order_fac'];
|
||||
}
|
||||
}
|
||||
$this->assign('online_order_fac', $pay_list[$pay_method]['online_order_fac']);
|
||||
$this->assign('payMethod', $payMethod);
|
||||
$this->assign('pay_routes', $pay_routes);
|
||||
$this->assign('client', 1);
|
||||
$this->assign('user_info', $user);
|
||||
return $this->fetch();
|
||||
}else{
|
||||
exit('页面错误,请退出再登录!');
|
||||
@@ -55,10 +70,26 @@ class Order Extends Controller{
|
||||
}
|
||||
$pay_method = $area_list[$user['area_id']]['pay'];
|
||||
if($user && $user['api_token'] == $api_token){
|
||||
$this->assign('online_order_fac',$pay_list[$pay_method]['online_order_fac']);
|
||||
$this->assign('payMethod',$pay_list[$pay_method]['type']);
|
||||
$this->assign('client',2);
|
||||
$this->assign('user_info',$user);
|
||||
// 主通道(按 area_list 的 pay 配置)
|
||||
$payMethod = $pay_list[$pay_method]['type'];
|
||||
$pay_routes = [];
|
||||
foreach($payMethod as $k => $v){
|
||||
$pay_routes[$k] = $pay_list[$pay_method]['online_order_fac'];
|
||||
}
|
||||
|
||||
// 越南地区追加 USDT (Epay) 通道作为第二选项
|
||||
if($user['area_id'] == 3 && !empty($pay_list['epay']['type'])){
|
||||
foreach($pay_list['epay']['type'] as $k => $v){
|
||||
$payMethod[$k] = $v;
|
||||
$pay_routes[$k] = $pay_list['epay']['online_order_fac'];
|
||||
}
|
||||
}
|
||||
|
||||
$this->assign('online_order_fac', $pay_list[$pay_method]['online_order_fac']); // 兼容旧模板
|
||||
$this->assign('payMethod', $payMethod);
|
||||
$this->assign('pay_routes', $pay_routes);
|
||||
$this->assign('client', 2);
|
||||
$this->assign('user_info', $user);
|
||||
return $this->fetch();
|
||||
}else{
|
||||
exit('页面错误,请退出再登录!');
|
||||
@@ -83,8 +114,9 @@ class Order Extends Controller{
|
||||
$zdlIdArr = explode(',',$user['agent_parent_id_path']);
|
||||
$area_list = config('area_list');
|
||||
//判断是否金流支线,如果不是的话,不允许充值
|
||||
$isAllow = false;
|
||||
foreach($area_list[$user['area_id']]['limit_agent'] as $allowAgentId){
|
||||
$limitAgents = $area_list[$user['area_id']]['limit_agent'];
|
||||
$isAllow = empty($limitAgents);
|
||||
foreach($limitAgents as $allowAgentId){
|
||||
if(in_array($allowAgentId,$zdlIdArr)){
|
||||
$isAllow = true;
|
||||
}
|
||||
@@ -153,9 +185,10 @@ class Order Extends Controller{
|
||||
$user = Db::name('user')->where(array('id' => $user_id))->find();
|
||||
$zdlIdArr = explode(',',$user['agent_parent_id_path']);
|
||||
$area_list = config('area_list');
|
||||
//判断是否金流支线,如果不是的话,不允许充值
|
||||
$isAllow = false;
|
||||
foreach($area_list[$user['area_id']]['limit_agent'] as $allowAgentId){
|
||||
//判断是否金流支线,如果不是的话,不允许提现
|
||||
$limitAgents = $area_list[$user['area_id']]['limit_agent'];
|
||||
$isAllow = empty($limitAgents);
|
||||
foreach($limitAgents as $allowAgentId){
|
||||
if(in_array($allowAgentId,$zdlIdArr)){
|
||||
$isAllow = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user