From 7ef07d34821545e60cf9659dd93d21432637d897 Mon Sep 17 00:00:00 2001 From: elf <360197197@qq.com> Date: Sun, 21 Aug 2022 23:29:58 +0800 Subject: [PATCH] yh --- Application/Admin/Conf/config.php | 2 +- .../CompanyStatementSetController.class.php | 2 +- .../CompanySystemRatioController.class.php | 4 ++-- .../Controller/ExportController.class.php | 4 ++-- .../Controller/FinanceController.class.php | 4 ++-- .../StatementMangementController.class.php | 4 ++-- .../StatementWarningSetController.class.php | 6 ++--- ...SubCompanyStatementSetController.class.php | 2 +- Application/Admin/Model/SpendModel.class.php | 2 +- .../createStatement.html | 2 +- .../editStatement.html | 2 +- .../viewStatement.html | 2 +- .../View/AggregateStatementLack/lists.html | 2 +- .../editCpStatement.html | 2 +- .../editPcStatement.html | 2 +- .../View/AggregateStatementPool/lists.html | 6 ++--- .../AggregateStatementPool/setPayment.html | 2 +- .../AggregateStatementPool/viewCpPool.html | 2 +- .../AggregateStatementPool/viewPayment.html | 2 +- .../AggregateStatementPool/viewPcPool.html | 2 +- .../viewPcStatement.html | 2 +- .../AggregateStatementPool/viewPuPool.html | 2 +- .../CompanyStatement/editCpStatement.html | 2 +- .../editPcComplementStatement.html | 2 +- .../CompanyStatement/editPcStatement.html | 2 +- .../editPuComplementStatement.html | 2 +- .../CompanyStatement/editPuStatement.html | 2 +- .../CompanyStatement/editWmCpStatement.html | 2 +- .../CompanyStatement/exportPuStatement.html | 2 +- .../Admin/View/CompanyStatement/lists.html | 8 +++---- .../CompanyStatement/showCpStatementList.html | 2 +- .../CompanyStatement/showCpStatementView.html | 2 +- .../CompanyStatement/subViewCpStatement.html | 2 +- .../CompanyStatement/viewCpStatement.html | 2 +- .../CompanyStatement/viewPcStatement.html | 2 +- .../viewPuComplementStatement.html | 2 +- .../CompanyStatement/viewPuStatement.html | 2 +- .../View/CompanyStatementLack/lists.html | 2 +- .../View/CompanyStatementOffline/lists.html | 10 ++++----- .../setPartPayment.html | 2 +- .../CompanyStatementOffline/setPayment.html | 2 +- .../viewstatement.html | 2 +- .../View/CompanyStatementPool/editCpPool.html | 2 +- .../CompanyStatementPool/editCpStatement.html | 2 +- .../View/CompanyStatementPool/editPcPool.html | 2 +- .../CompanyStatementPool/editPcStatement.html | 2 +- .../View/CompanyStatementPool/editPuPool.html | 2 +- .../editSpecialPuPool.html | 2 +- .../View/CompanyStatementPool/lists.html | 12 +++++----- .../View/CompanyStatementPool/setPayment.html | 2 +- .../View/CompanyStatementPool/viewCpPool.html | 2 +- .../CompanyStatementPool/viewPayment.html | 2 +- .../View/CompanyStatementPool/viewPcPool.html | 2 +- .../CompanyStatementPool/viewPcStatement.html | 2 +- .../View/CompanyStatementPool/viewPuPool.html | 2 +- .../Admin/View/CompanySystemRatio/export.html | 2 +- .../Admin/View/CompanySystemRatio/index.html | 4 ++-- .../Admin/View/Finance/gameStatistics.html | 12 +++++----- .../Admin/View/GameMargin/marginView.html | 2 +- .../View/MarketPercentage/coefficient.html | 2 +- Application/Admin/View/Partner/add.html | 6 ++--- Application/Admin/View/Partner/edit.html | 2 +- Application/Admin/View/Partner/show.html | 2 +- .../Admin/View/PromoteCompany/add.html | 2 +- .../Admin/View/PromoteCompany/edit.html | 2 +- .../Admin/View/PromoteCompany/view.html | 2 +- Application/Admin/View/Public/cp_base.html | 2 +- .../View/Statement/createCpStatement.html | 2 +- .../Admin/View/Statement/editCpStatement.html | 2 +- .../View/StatementMangement/addreward.html | 2 +- .../createDownstreamOrder.html | 4 ++-- .../Admin/View/StatementMangement/edit.html | 4 ++-- .../Admin/View/StatementMangement/lists.html | 10 ++++----- .../View/StatementWarning/infoLists.html | 6 ++--- .../View/SubCompanyStatementPool/lists.html | 12 +++++----- Application/Admin/View/SubSpend/lists.html | 2 +- .../Admin/View/SubUserStatement/lists.html | 2 +- .../View/SubUserStatement/viewPuPool.html | 2 +- .../Admin/View/UserPayWhiteList/index.html | 10 ++++----- .../Admin/View/VerifyBill/company_show.html | 4 ++-- Application/Admin/View/VerifyBill/index.html | 4 ++-- .../Admin/View/VerifyBill/partner_show.html | 4 ++-- Application/Common/Common/extend.php | 2 +- Application/Common/Conf/seo_media_config.php | 2 +- .../Controller/PromoteController.class.php | 2 +- .../Home/View/default/Index/accessLimit.html | 2 +- .../Home/View/default/Poster/index.html | 4 ++-- .../Media/View/default/Index/hezuo.html | 13 +++-------- .../Media/View/default/Index/index.html | 2 +- .../Media/View/default/Public/base.html | 2 +- .../Mobile/Controller/SsgController.class.php | 6 ++--- Application/Mobile/View/Index/business.html | 10 ++++----- Application/Mobile/View/Index/index.html | 2 +- Application/Mobile/View/Index/introduce.html | 4 ++-- Application/Mobile/View/Index/product.html | 2 +- Application/Mobile/View/Ssg/pay.html | 2 +- Application/Mobile/View/User/userauth.html | 2 +- Application/Mobile/View/User/usergame.html | 2 +- Application/Payment/Conf/config.php | 2 +- .../Payment/View/ExcelPayment/add.html | 2 +- .../Payment/View/ExcelPayment/lists.html | 2 +- .../Payment/View/ExcelPayment/viewPuPool.html | 2 +- Application/Payment/View/Payment/lists.html | 4 ++-- .../Payment/View/Payment/memberlist.html | 2 +- .../Payment/View/Payment/setPayment.html | 2 +- .../Payment/View/Payment/viewCpPool.html | 2 +- .../Payment/View/Payment/viewPcPool.html | 2 +- .../Payment/View/Payment/viewPuPool.html | 2 +- Application/Payment/View/WxPayment/lists.html | 2 +- .../Controller/PromoteController.class.php | 2 +- .../QrCodePromotionController.class.php | 2 +- .../Qrcode/View/default/Jump/jumpMp.html | 2 +- .../Sdk/Controller/AppleController.class.php | 6 ++--- .../Sdk/Controller/Ipa365Controller.class.php | 22 +++++++++---------- .../Sdk/Controller/WapPayController.class.php | 12 +++++----- Application/Sdk/View/default/Ipa365/pay.html | 2 +- .../Sdk/View/default/Ipa365/payback.html | 2 +- .../Sdk/View/default/Ipa365/paytip.html | 4 ++-- Data/update.sql | 12 +++++----- Poster/index.html | 10 ++++----- README.md | 6 ++--- .../Library/Org/HeepaySDK/Heepay.class.php | 6 ++--- ThinkPHP/Library/Org/SqpaySDK/Sqpay.class.php | 2 +- poster.html | 14 ++++++------ 124 files changed, 220 insertions(+), 227 deletions(-) diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index 13e08ca..2633346 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -112,7 +112,7 @@ return array( 'TMPL_ACTION_SUCCESS' => MODULE_PATH.'View/Public/success.html', // 默认成功跳转对应的模板文件 'TMPL_EXCEPTION_FILE' => MODULE_PATH.'View/Public/exception.html',// 异常页面的模板文件 /*默认公司名称*/ - 'DEFAULT_COMPANY'=>"海南万盟天下科技有限公司", + 'DEFAULT_COMPANY'=>"聚游", 'OFFICIEL_CHANNEL'=>"江息网络", /*分库的表格*/ 'SUBSITE_TABLE'=>[ diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 8a55d8e..3be570e 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -521,7 +521,7 @@ class CompanyStatementSetController extends Controller { "company_type"=>1 ]; //获取pc公司 - $company = M("CompanyInfo","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("partner = '海南万盟天下科技有限公司'")->find(); + $company = M("CompanyInfo","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("partner = '聚游'")->find(); $first_party_info = json_encode($company,JSON_UNESCAPED_UNICODE); $company['partner'] = C("OFFICIEL_CHANNEL"); $second_party_info = json_encode($company,JSON_UNESCAPED_UNICODE); diff --git a/Application/Admin/Controller/CompanySystemRatioController.class.php b/Application/Admin/Controller/CompanySystemRatioController.class.php index 46d7eb8..5dcd354 100644 --- a/Application/Admin/Controller/CompanySystemRatioController.class.php +++ b/Application/Admin/Controller/CompanySystemRatioController.class.php @@ -5,7 +5,7 @@ namespace Admin\Controller; class CompanySystemRatioController extends AdminController { - private $api = "http://admin.wmtxkj.cn/index.php?g=Api&m=CpJuheCompany&a=ratioIndex"; + private $api = "http://admin.jianhuifa.cn/index.php?g=Api&m=CpJuheCompany&a=ratioIndex"; public function _initialize() { @@ -187,7 +187,7 @@ class CompanySystemRatioController extends AdminController $time = date("Y-m-d",time()); - $this->assign('title',"海南万盟天下产品分成比例体系[{$time}]"); + $this->assign('title',"聚游产品分成比例体系[{$time}]"); $this->display("export");die(); } diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 0a375e2..a7ead71 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -8418,8 +8418,8 @@ class ExportController extends Controller // array('inside_cash_count','内充支出'), // array('all_cash_count','游戏内充值合计'), // array('notice_fail_count','联运通知失败合计'), - // array('agg_wm_amount','聚合万盟数据'), - // array('agg_wm_failed_amount','聚合万盟通知失败'), + // array('agg_wm_amount','聚合聚游数据'), + // array('agg_wm_failed_amount','聚合聚游通知失败'), // array('test_amount','聚合平台测试订单'), // array('agg_amount','聚合其他渠道数据'), // array('agg_failed_amount','聚合其他渠道通知失败订单'), diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index a6ccab5..abba4c1 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -874,8 +874,8 @@ class FinanceController extends ThinkController 'all_cash_count'=>'游戏内充值合计', 'discount_amount'=>'优惠金额', 'notice_fail_count'=>'联运通知失败合计', - 'agg_wm_amount'=>'聚合万盟数据', - 'agg_wm_failed_amount'=>'聚合万盟通知失败', + 'agg_wm_amount'=>'聚合聚游数据', + 'agg_wm_failed_amount'=>'聚合聚游通知失败', 'test_amount'=>'聚合平台测试订单', 'agg_amount'=>'聚合其他渠道数据', 'agg_failed_amount'=>'聚合其他渠道通知失败订单' diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index dfabd0d..acac72d 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -48,8 +48,8 @@ class StatementMangementController extends ThinkController if ($_REQUEST['company_id']) { $map['company_name'] = $_REQUEST['company_id']; - // if ($_REQUEST['company_id']=='万盟天下科技') { - // $map['company_name'] = '海南万盟天下科技有限公司'; + // if ($_REQUEST['company_id']=='聚游') { + // $map['company_name'] = '聚游'; // } } diff --git a/Application/Admin/Controller/StatementWarningSetController.class.php b/Application/Admin/Controller/StatementWarningSetController.class.php index 69f8502..2e32f63 100644 --- a/Application/Admin/Controller/StatementWarningSetController.class.php +++ b/Application/Admin/Controller/StatementWarningSetController.class.php @@ -23,7 +23,7 @@ class StatementWarningSetController extends Controller { private $cpCompanyIsWm; private $promoteCompanyIsWm; private $statementWarningKey=[ - 'wm_platm'=>'万盟平台', + 'wm_platm'=>'聚游平台', 'up_statement'=>'上游', 'pc_statement'=>'下游内团', 'pu_statement'=>'下游外团', @@ -127,7 +127,7 @@ class StatementWarningSetController extends Controller { $this->inSideCompanyIds = implode(",",$res); } /** - * 获取CP是否万盟结算数据 + * 获取CP是否聚游结算数据 */ private function setCompanyIsWm() { @@ -177,7 +177,7 @@ class StatementWarningSetController extends Controller { } /** - * 获取当前万盟结算额 + * 获取当前聚游结算额 */ private function getAllWmAmount() { diff --git a/Application/Admin/Controller/SubCompanyStatementSetController.class.php b/Application/Admin/Controller/SubCompanyStatementSetController.class.php index d160f6d..7be4d75 100644 --- a/Application/Admin/Controller/SubCompanyStatementSetController.class.php +++ b/Application/Admin/Controller/SubCompanyStatementSetController.class.php @@ -378,7 +378,7 @@ class SubCompanyStatementSetController extends Controller { "company_type"=>1 ]; //获取pc公司 - $company = M("CompanyInfo","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("partner = '海南万盟天下科技有限公司'")->find(); + $company = M("CompanyInfo","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("partner = '聚游'")->find(); $first_party_info = json_encode($company,JSON_UNESCAPED_UNICODE); $company['partner'] = C("OFFICIEL_CHANNEL"); $second_party_info = json_encode($company,JSON_UNESCAPED_UNICODE); diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php index d3fe696..ed38e10 100644 --- a/Application/Admin/Model/SpendModel.class.php +++ b/Application/Admin/Model/SpendModel.class.php @@ -974,7 +974,7 @@ class SpendModel extends Model } /** - *获取聚合万盟数据 + *获取聚合聚游数据 */ public function totalWmGameStatistics($map,$gameIds) { diff --git a/Application/Admin/View/AggregateFinanceStatement/createStatement.html b/Application/Admin/View/AggregateFinanceStatement/createStatement.html index 75a4280..bfbf698 100644 --- a/Application/Admin/View/AggregateFinanceStatement/createStatement.html +++ b/Application/Admin/View/AggregateFinanceStatement/createStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/AggregateFinanceStatement/editStatement.html b/Application/Admin/View/AggregateFinanceStatement/editStatement.html index 309cef1..ede5ee8 100644 --- a/Application/Admin/View/AggregateFinanceStatement/editStatement.html +++ b/Application/Admin/View/AggregateFinanceStatement/editStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/AggregateFinanceStatement/viewStatement.html b/Application/Admin/View/AggregateFinanceStatement/viewStatement.html index 037f7d3..36f4c3c 100644 --- a/Application/Admin/View/AggregateFinanceStatement/viewStatement.html +++ b/Application/Admin/View/AggregateFinanceStatement/viewStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/AggregateStatementLack/lists.html b/Application/Admin/View/AggregateStatementLack/lists.html index e5bd530..633255c 100644 --- a/Application/Admin/View/AggregateStatementLack/lists.html +++ b/Application/Admin/View/AggregateStatementLack/lists.html @@ -266,7 +266,7 @@ var url = "{:U('viewStatement')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], diff --git a/Application/Admin/View/AggregateStatementPool/editCpStatement.html b/Application/Admin/View/AggregateStatementPool/editCpStatement.html index 23efb5c..3b8487d 100644 --- a/Application/Admin/View/AggregateStatementPool/editCpStatement.html +++ b/Application/Admin/View/AggregateStatementPool/editCpStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/AggregateStatementPool/editPcStatement.html b/Application/Admin/View/AggregateStatementPool/editPcStatement.html index d030fc6..c1b2358 100644 --- a/Application/Admin/View/AggregateStatementPool/editPcStatement.html +++ b/Application/Admin/View/AggregateStatementPool/editPcStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/AggregateStatementPool/lists.html b/Application/Admin/View/AggregateStatementPool/lists.html index 9ba8fe1..9b439e9 100644 --- a/Application/Admin/View/AggregateStatementPool/lists.html +++ b/Application/Admin/View/AggregateStatementPool/lists.html @@ -273,7 +273,7 @@ var url = "{:U('viewPool')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -414,7 +414,7 @@ var url = "{:U('setPayment')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['70%', '80%'], @@ -426,7 +426,7 @@ var url = "{:U('viewPayment')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['70%', '80%'], diff --git a/Application/Admin/View/AggregateStatementPool/setPayment.html b/Application/Admin/View/AggregateStatementPool/setPayment.html index 9ace64b..66f7c73 100644 --- a/Application/Admin/View/AggregateStatementPool/setPayment.html +++ b/Application/Admin/View/AggregateStatementPool/setPayment.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/AggregateStatementPool/viewCpPool.html b/Application/Admin/View/AggregateStatementPool/viewCpPool.html index 2fe543a..f8268df 100644 --- a/Application/Admin/View/AggregateStatementPool/viewCpPool.html +++ b/Application/Admin/View/AggregateStatementPool/viewCpPool.html @@ -87,7 +87,7 @@
diff --git a/Application/Admin/View/AggregateStatementPool/viewPayment.html b/Application/Admin/View/AggregateStatementPool/viewPayment.html index 3c2edbe..1ab0224 100644 --- a/Application/Admin/View/AggregateStatementPool/viewPayment.html +++ b/Application/Admin/View/AggregateStatementPool/viewPayment.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/AggregateStatementPool/viewPcPool.html b/Application/Admin/View/AggregateStatementPool/viewPcPool.html index 1821046..a3bf21b 100644 --- a/Application/Admin/View/AggregateStatementPool/viewPcPool.html +++ b/Application/Admin/View/AggregateStatementPool/viewPcPool.html @@ -87,7 +87,7 @@
diff --git a/Application/Admin/View/AggregateStatementPool/viewPcStatement.html b/Application/Admin/View/AggregateStatementPool/viewPcStatement.html index 9765e8d..1e94afc 100644 --- a/Application/Admin/View/AggregateStatementPool/viewPcStatement.html +++ b/Application/Admin/View/AggregateStatementPool/viewPcStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/AggregateStatementPool/viewPuPool.html b/Application/Admin/View/AggregateStatementPool/viewPuPool.html index 993c9d2..7694ac9 100644 --- a/Application/Admin/View/AggregateStatementPool/viewPuPool.html +++ b/Application/Admin/View/AggregateStatementPool/viewPuPool.html @@ -87,7 +87,7 @@
diff --git a/Application/Admin/View/CompanyStatement/editCpStatement.html b/Application/Admin/View/CompanyStatement/editCpStatement.html index 23efb5c..3b8487d 100644 --- a/Application/Admin/View/CompanyStatement/editCpStatement.html +++ b/Application/Admin/View/CompanyStatement/editCpStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatement/editPcComplementStatement.html b/Application/Admin/View/CompanyStatement/editPcComplementStatement.html index 2150e8b..07dac2a 100644 --- a/Application/Admin/View/CompanyStatement/editPcComplementStatement.html +++ b/Application/Admin/View/CompanyStatement/editPcComplementStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatement/editPcStatement.html b/Application/Admin/View/CompanyStatement/editPcStatement.html index ea33272..8f00152 100644 --- a/Application/Admin/View/CompanyStatement/editPcStatement.html +++ b/Application/Admin/View/CompanyStatement/editPcStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatement/editPuComplementStatement.html b/Application/Admin/View/CompanyStatement/editPuComplementStatement.html index a1d18ff..b3e42ff 100644 --- a/Application/Admin/View/CompanyStatement/editPuComplementStatement.html +++ b/Application/Admin/View/CompanyStatement/editPuComplementStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatement/editPuStatement.html b/Application/Admin/View/CompanyStatement/editPuStatement.html index 9e99cba..399baf5 100644 --- a/Application/Admin/View/CompanyStatement/editPuStatement.html +++ b/Application/Admin/View/CompanyStatement/editPuStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatement/editWmCpStatement.html b/Application/Admin/View/CompanyStatement/editWmCpStatement.html index cff9300..aa61d5a 100644 --- a/Application/Admin/View/CompanyStatement/editWmCpStatement.html +++ b/Application/Admin/View/CompanyStatement/editWmCpStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatement/exportPuStatement.html b/Application/Admin/View/CompanyStatement/exportPuStatement.html index 74a9711..9f07b5b 100644 --- a/Application/Admin/View/CompanyStatement/exportPuStatement.html +++ b/Application/Admin/View/CompanyStatement/exportPuStatement.html @@ -87,7 +87,7 @@
diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html index 4839159..0f020cb 100644 --- a/Application/Admin/View/CompanyStatement/lists.html +++ b/Application/Admin/View/CompanyStatement/lists.html @@ -455,7 +455,7 @@ var url = "{:U('viewStatement')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['70%', '80%'], @@ -468,7 +468,7 @@ var url = "{:U('viewSpecialComplement')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['70%', '80%'], @@ -482,7 +482,7 @@ layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['70%', '80%'], @@ -618,7 +618,7 @@ var url = "{:U('poolWmStatement')}"+"&id="+text; layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['70%', '80%'], diff --git a/Application/Admin/View/CompanyStatement/showCpStatementList.html b/Application/Admin/View/CompanyStatement/showCpStatementList.html index 991568c..cdb6ccd 100644 --- a/Application/Admin/View/CompanyStatement/showCpStatementList.html +++ b/Application/Admin/View/CompanyStatement/showCpStatementList.html @@ -233,7 +233,7 @@ var url = "{:U('viewStatement')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], diff --git a/Application/Admin/View/CompanyStatement/showCpStatementView.html b/Application/Admin/View/CompanyStatement/showCpStatementView.html index 505fef9..2e1db2c 100644 --- a/Application/Admin/View/CompanyStatement/showCpStatementView.html +++ b/Application/Admin/View/CompanyStatement/showCpStatementView.html @@ -90,7 +90,7 @@
diff --git a/Application/Admin/View/CompanyStatement/subViewCpStatement.html b/Application/Admin/View/CompanyStatement/subViewCpStatement.html index 32cc528..9cfe458 100644 --- a/Application/Admin/View/CompanyStatement/subViewCpStatement.html +++ b/Application/Admin/View/CompanyStatement/subViewCpStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/CompanyStatement/viewCpStatement.html b/Application/Admin/View/CompanyStatement/viewCpStatement.html index 353bcdf..8774636 100644 --- a/Application/Admin/View/CompanyStatement/viewCpStatement.html +++ b/Application/Admin/View/CompanyStatement/viewCpStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/CompanyStatement/viewPcStatement.html b/Application/Admin/View/CompanyStatement/viewPcStatement.html index b0ae3a7..74380f7 100644 --- a/Application/Admin/View/CompanyStatement/viewPcStatement.html +++ b/Application/Admin/View/CompanyStatement/viewPcStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html b/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html index efd183e..0b124d0 100644 --- a/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html +++ b/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/CompanyStatement/viewPuStatement.html b/Application/Admin/View/CompanyStatement/viewPuStatement.html index 17a7beb..105c823 100644 --- a/Application/Admin/View/CompanyStatement/viewPuStatement.html +++ b/Application/Admin/View/CompanyStatement/viewPuStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/CompanyStatementLack/lists.html b/Application/Admin/View/CompanyStatementLack/lists.html index d64af31..9bfd4fb 100644 --- a/Application/Admin/View/CompanyStatementLack/lists.html +++ b/Application/Admin/View/CompanyStatementLack/lists.html @@ -270,7 +270,7 @@ var url = "{:U('viewStatement')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], diff --git a/Application/Admin/View/CompanyStatementOffline/lists.html b/Application/Admin/View/CompanyStatementOffline/lists.html index 700c820..34deb3b 100644 --- a/Application/Admin/View/CompanyStatementOffline/lists.html +++ b/Application/Admin/View/CompanyStatementOffline/lists.html @@ -254,7 +254,7 @@ var url = "{:U('CompanyStatementPool/viewPool')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -341,7 +341,7 @@ url = "{:U('setPayment')}"+"&id="+text; layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -357,7 +357,7 @@ layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -373,7 +373,7 @@ layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -387,7 +387,7 @@ var url = "{:U('viewStatement')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], diff --git a/Application/Admin/View/CompanyStatementOffline/setPartPayment.html b/Application/Admin/View/CompanyStatementOffline/setPartPayment.html index a1a1021..b744747 100644 --- a/Application/Admin/View/CompanyStatementOffline/setPartPayment.html +++ b/Application/Admin/View/CompanyStatementOffline/setPartPayment.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatementOffline/setPayment.html b/Application/Admin/View/CompanyStatementOffline/setPayment.html index 4463f07..68283c5 100644 --- a/Application/Admin/View/CompanyStatementOffline/setPayment.html +++ b/Application/Admin/View/CompanyStatementOffline/setPayment.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatementOffline/viewstatement.html b/Application/Admin/View/CompanyStatementOffline/viewstatement.html index 2cc0926..46ca443 100644 --- a/Application/Admin/View/CompanyStatementOffline/viewstatement.html +++ b/Application/Admin/View/CompanyStatementOffline/viewstatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/editCpPool.html b/Application/Admin/View/CompanyStatementPool/editCpPool.html index 9bd6c27..31c2a44 100644 --- a/Application/Admin/View/CompanyStatementPool/editCpPool.html +++ b/Application/Admin/View/CompanyStatementPool/editCpPool.html @@ -88,7 +88,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/editCpStatement.html b/Application/Admin/View/CompanyStatementPool/editCpStatement.html index 23efb5c..3b8487d 100644 --- a/Application/Admin/View/CompanyStatementPool/editCpStatement.html +++ b/Application/Admin/View/CompanyStatementPool/editCpStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/editPcPool.html b/Application/Admin/View/CompanyStatementPool/editPcPool.html index cb3858f..8183020 100644 --- a/Application/Admin/View/CompanyStatementPool/editPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPcPool.html @@ -88,7 +88,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/editPcStatement.html b/Application/Admin/View/CompanyStatementPool/editPcStatement.html index d030fc6..c1b2358 100644 --- a/Application/Admin/View/CompanyStatementPool/editPcStatement.html +++ b/Application/Admin/View/CompanyStatementPool/editPcStatement.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index 09ffb8c..cd57203 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -91,7 +91,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html index 3af485a..bf8e31c 100644 --- a/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editSpecialPuPool.html @@ -91,7 +91,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index e791ebd..4004a10 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -298,7 +298,7 @@ var url = "{:U('viewPool')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -311,7 +311,7 @@ var url = "{:U('viewUnPaymentPool')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -324,7 +324,7 @@ var url = "{:U('editPool')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -337,7 +337,7 @@ var url = "{:U('editPool')}"+"&id="+id+"&type=1" layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -567,7 +567,7 @@ var url = "{:U('setPayment')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], @@ -579,7 +579,7 @@ var url = "{:U('viewPayment')}"+"&id="+id layer.open({ type: 2, - title: "海南万盟天下科技有限公司", + title: "聚游", shadeClose: true, shade: 0.8, area: ['100%', '100%'], diff --git a/Application/Admin/View/CompanyStatementPool/setPayment.html b/Application/Admin/View/CompanyStatementPool/setPayment.html index 841a5de..56dc811 100644 --- a/Application/Admin/View/CompanyStatementPool/setPayment.html +++ b/Application/Admin/View/CompanyStatementPool/setPayment.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html index 8246556..21a9eaf 100644 --- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewCpPool.html @@ -87,7 +87,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/viewPayment.html b/Application/Admin/View/CompanyStatementPool/viewPayment.html index 4f1dfca..ca5a0b8 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPayment.html +++ b/Application/Admin/View/CompanyStatementPool/viewPayment.html @@ -95,7 +95,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html index 6b51861..d3344cf 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html @@ -87,7 +87,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/viewPcStatement.html b/Application/Admin/View/CompanyStatementPool/viewPcStatement.html index 9765e8d..1e94afc 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPcStatement.html +++ b/Application/Admin/View/CompanyStatementPool/viewPcStatement.html @@ -83,7 +83,7 @@
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index 4e3f9b2..c7bef46 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -90,7 +90,7 @@
diff --git a/Application/Admin/View/CompanySystemRatio/export.html b/Application/Admin/View/CompanySystemRatio/export.html index 5f36a76..1566dd6 100644 --- a/Application/Admin/View/CompanySystemRatio/export.html +++ b/Application/Admin/View/CompanySystemRatio/export.html @@ -90,7 +90,7 @@
diff --git a/Application/Admin/View/CompanySystemRatio/index.html b/Application/Admin/View/CompanySystemRatio/index.html index 6cf71a3..643aa72 100644 --- a/Application/Admin/View/CompanySystemRatio/index.html +++ b/Application/Admin/View/CompanySystemRatio/index.html @@ -100,12 +100,12 @@
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index 8678dc3..0d66bbd 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/Application/Admin/View/Finance/gameStatistics.html @@ -84,11 +84,11 @@
  • 数据相关说明
  • 上游结算: - 游戏内充值合计 + 聚合万盟数据 + 聚合其他渠道数据 + 游戏内充值合计 + 聚合聚游数据 + 聚合其他渠道数据
  • 下游结算: - 游戏内充值合计 + 联运通知失败合计 + 聚合万盟数据 + 聚合万盟通知失败 - 下游不结算订单 + 游戏内充值合计 + 联运通知失败合计 + 聚合聚游数据 + 聚合聚游通知失败 - 下游不结算订单
  • 下游不结算订单: @@ -195,11 +195,11 @@
    优惠金额游戏折扣和代金券优惠金额
    联运通知失败合计联运所有通知失败的合计金额
    -
    聚合万盟数据聚合平台万盟渠道支付成功且通知成功的金额
    -
    聚合万盟通知失败聚合平台万盟渠道通知失败的订单合计金额
    +
    聚合聚游数据聚合平台聚游渠道支付成功且通知成功的金额
    +
    聚合聚游通知失败聚合平台聚游渠道通知失败的订单合计金额
    聚合平台测试订单聚合平台测试订单
    -
    聚合其他渠道数据聚合平台其他渠道(不含万盟)支付成功通知成功订单合计
    -
    聚合其他渠道
    通知失败订单
    聚合平台其他渠道(不含万盟)
    通知失败的订单合计金额
    +
    聚合其他渠道数据聚合平台其他渠道(不含聚游)支付成功通知成功订单合计
    +
    聚合其他渠道
    通知失败订单
    聚合平台其他渠道(不含聚游)
    通知失败的订单合计金额
    操作 diff --git a/Application/Admin/View/GameMargin/marginView.html b/Application/Admin/View/GameMargin/marginView.html index 2ad5372..c1a3d5f 100644 --- a/Application/Admin/View/GameMargin/marginView.html +++ b/Application/Admin/View/GameMargin/marginView.html @@ -97,7 +97,7 @@
    diff --git a/Application/Admin/View/MarketPercentage/coefficient.html b/Application/Admin/View/MarketPercentage/coefficient.html index b572440..f50817c 100644 --- a/Application/Admin/View/MarketPercentage/coefficient.html +++ b/Application/Admin/View/MarketPercentage/coefficient.html @@ -90,7 +90,7 @@
    diff --git a/Application/Admin/View/Partner/add.html b/Application/Admin/View/Partner/add.html index 65f5adb..1a12057 100644 --- a/Application/Admin/View/Partner/add.html +++ b/Application/Admin/View/Partner/add.html @@ -173,7 +173,7 @@ @@ -192,7 +192,7 @@ @@ -470,7 +470,7 @@ if (indexNum == 1) { "" $(id).append( - "" + "" ); ""; } diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html index cc36739..4e3c6b6 100644 --- a/Application/Admin/View/Partner/edit.html +++ b/Application/Admin/View/Partner/edit.html @@ -491,7 +491,7 @@ if (indexNum == 1) { "" $(id).append( - "" + "" ); ""; } diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html index df69e35..348fb0b 100644 --- a/Application/Admin/View/Partner/show.html +++ b/Application/Admin/View/Partner/show.html @@ -483,7 +483,7 @@ if (indexNum == 1) { "" $(id).append( - "" + "" ); ""; } diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html index 3728d89..a9b5ee9 100644 --- a/Application/Admin/View/PromoteCompany/add.html +++ b/Application/Admin/View/PromoteCompany/add.html @@ -860,7 +860,7 @@ if (indexNum == 1) { "" $(id).append( - "" + "" ); ""; } diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index 7955872..88b74fe 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -859,7 +859,7 @@ if (indexNum == 1) { "" $(id).append( - "" + "" ); ""; } diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html index 94446a1..83c7ae5 100644 --- a/Application/Admin/View/PromoteCompany/view.html +++ b/Application/Admin/View/PromoteCompany/view.html @@ -842,7 +842,7 @@ if (indexNum == 1) { "" $(id).append( - "" + "" ); ""; } diff --git a/Application/Admin/View/Public/cp_base.html b/Application/Admin/View/Public/cp_base.html index eb2d19f..3ad50b9 100644 --- a/Application/Admin/View/Public/cp_base.html +++ b/Application/Admin/View/Public/cp_base.html @@ -212,7 +212,7 @@
    功能菜单