diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php
index 13e08caaa..dec60fa5d 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 8a55d8ea3..ba93f4644 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 46d7eb86a..dc0329807 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.chengfeng123.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 0a375e21c..c69372921 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 a6ccab551..2892beffc 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'=>'聚合其他渠道通知失败订单'
@@ -895,7 +895,8 @@ class FinanceController extends ThinkController
$this->checkListOrCountAuthRestMap($map,[]);
$testWhere['_string'] .= ' and game_id in(' . implode(',', $exceptIds) . ')';
- $testAllAmount = M('test_order', 'tab_')->where($testWhere)->sum('pay_amount');
+ // $testAllAmount = M('test_order', 'tab_')->where($testWhere)->sum('pay_amount'); // 有bug 20220822
+ $testAllAmount = 0;
//统计合计
if (count($exceptIds) > 0) {
diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 2c762fb8e..290735208 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -1337,11 +1337,17 @@ class MarketPercentageController extends ThinkController
$map = ['_string' => '1=1'];
$groupIds = $this->MarketEvent->getMarketGroupId();
+ $conditions = [];
+ if (empty($groupIds)) {
+ $conditions['_string'] = '1=0';
+ } else {
+ $conditions['group_id'] = ['in', $groupIds];
+ }
$admin_data = M("member")
->field("access.uid admin_id")
->join("left join sys_auth_group_access access on sys_member.uid = access.uid")
->join("left join sys_auth_group auth on access.group_id=auth.id")
- ->where(['group_id' => ['in', $groupIds]])
+ ->where($conditions)
->select();
if ($admin_data) {
$map['tab_market_altogether.admin_id'] = ['in', array_column($admin_data, 'admin_id')];
diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php
index 49f61c3bc..3d4da1136 100644
--- a/Application/Admin/Controller/PayChannelController.class.php
+++ b/Application/Admin/Controller/PayChannelController.class.php
@@ -100,12 +100,19 @@ class PayChannelController extends ThinkController
$handleCoinData[$value['game_id']] = $value['platform_coin'];
}
//测试白名单
- $testList = implode(",",M("test_white_list","tab_")->getField("user_id",true));
+ $testList = M("test_white_list","tab_")->getField("user_id",true);
+
+ $conditions = [];
+ if (empty($testList)) {
+ $conditions['_string'] = '1=0';
+ } else {
+ $conditions['user_id'] = ['in', $testList];
+ }
//测试数据汇总计算
$testData = M('spend','tab_')
->field("sum(pay_amount) as test_coin,game_name,game_id")
->where($map)
- ->where("user_id in ({$testList})")
+ ->where($conditions)
->group('game_id')
->select();
diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index 46177663a..76646f766 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -1095,7 +1095,7 @@ class PromoteCompanyController extends ThinkController
}
$list = M('service_agreement', 'tab_')
->field("tab_service_agreement.*, group_concat(distinct(tab_promote_company.company_name)) as company_name")
- ->join('tab_promote_company on tab_promote_company.service_agreement_show = tab_service_agreement.id', 'LEFT')->where($map)->group('tab_service_agreement.id asc')->page($p, $row)->order("status desc")->select();
+ ->join('tab_promote_company on tab_promote_company.service_agreement_show = tab_service_agreement.id', 'LEFT')->where($map)->group('tab_service_agreement.id')->page($p, $row)->order("status desc")->select();
$count = M('service_agreement', 'tab_')->where($map)->count();
$page = set_pagination($count, $row);
if ($page) {
diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php
index dfabd0d8b..fecf53e02 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 69f8502d6..5ef9d07b6 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 d160f6d34..041382271 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/Event/MarketEvent.class.php b/Application/Admin/Event/MarketEvent.class.php
index 5683285fa..484318c60 100644
--- a/Application/Admin/Event/MarketEvent.class.php
+++ b/Application/Admin/Event/MarketEvent.class.php
@@ -36,6 +36,7 @@ class MarketEvent extends Controller
*/
public function getMarketGroupId($departmentId = null)
{
+ return [];
$departmentIds = $departmentId ? $departmentId : $this->MarketDepartmentId;
$res = M('department','sys_')->where("id in ({$departmentIds})")->getField("group_ids",true);
$sendData = '';
diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php
index d3fe696b9..354f04c27 100644
--- a/Application/Admin/Model/SpendModel.class.php
+++ b/Application/Admin/Model/SpendModel.class.php
@@ -897,9 +897,12 @@ class SpendModel extends Model
*/
public function gameStatistics($map,$gameIds, $row = 0, $page = 1)
{
- $gameMap = [
- "g.id"=>["in",$gameIds]
- ];
+ $gameMap = [];
+ if (empty($gameIds)) {
+ $gameMap['_string'] = '1=0';
+ } else {
+ $gameMap['g.id'] = ['in', $gameIds];
+ }
$gameQuery = M('game', 'tab_')
->alias('g')
->field(['g.id game_id', 'g.relation_game_name game_name', 'g.unique_code', 'g.game_type_name', 'g.sdk_version','IFNULL(p.partner,"无") as partner_name'])
@@ -974,7 +977,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 75a4280e7..903cb4d6f 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 309cef1f3..4ffe2279d 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 037f7d39a..b87670826 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 e5bd530c8..a3f346219 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 23efb5ce8..4b2515cc1 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 d030fc6b8..5ec6a9e79 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 9ba8fe108..b71720bce 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 9ace64b39..6c89fe2fb 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 2fe543ae5..1276c62fa 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 3c2edbee7..37c82b4c9 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 1821046e7..5d04a5d2a 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 9765e8d35..827a91a3b 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 993c9d262..fbc258079 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 23efb5ce8..4b2515cc1 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 2150e8ba0..95168f206 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 ea332726c..43c9faf2c 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 a1d18ff01..b7f9b48db 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 9e99cba80..3594cb4a0 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 cff930076..3584edd50 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 74a971138..73ae6109c 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 483915996..a1700f4cb 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 991568c07..ddb7d7a09 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 505fef986..d15a7d13f 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 32cc52863..914176346 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 353bcdf78..761c9eaa7 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 b0ae3a7d6..bc1fba353 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 efd183ea6..0de8f05a4 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 17a7beb6a..79fcb56bf 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 d64af316f..7fee9405c 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 700c82016..7b9aede3a 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 a1a1021f3..0f906733e 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 4463f07d7..5a1df976c 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 2cc0926ba..77c2736c4 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 9bd6c27da..6c3c5bc1b 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 23efb5ce8..4b2515cc1 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 cb3858f34..c8b6bc65f 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 d030fc6b8..5ec6a9e79 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 09ffb8cce..ffb2d0d69 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 3af485a13..acc673c6b 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 e791ebd42..f298af840 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 841a5dee4..ad12577b0 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 824655697..dad16c613 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 4f1dfca5a..49bcf1ecc 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 6b51861c5..7b63ca6bc 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 9765e8d35..827a91a3b 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 4e3f9b294..da1a15a50 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 5f36a76ce..35af5e605 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 6cf71a3f9..7569b1fb4 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 8678dc3c8..87b55c649 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 2ad5372d0..f95381798 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 b5724407a..390adfa2d 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 65f5adbcb..6335b4e8b 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 cc36739df..abba423b4 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 df69e3536..66c15b475 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 3728d8916..79b06f2e5 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 7955872a1..787169307 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 94446a1ea..24eb840ac 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 eb2d19f8c..ad510454b 100644
--- a/Application/Admin/View/Public/cp_base.html
+++ b/Application/Admin/View/Public/cp_base.html
@@ -212,7 +212,7 @@
功能菜单
- 万盟对账单管理
+ 橙枫对账单管理
|