From 15b9efcd7e6287df7396baad278679d606e7855b Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 29 Jun 2020 17:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=9F=E6=81=AF=E7=BD=91=E7=BB=9C=E6=BC=8F?= =?UTF-8?q?=E6=8E=89=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinancePromoteController.class.php | 2 +- Application/Admin/Model/PromoteModel.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 081905879..8c498cb1f 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -120,7 +120,7 @@ class FinancePromoteController extends AdminController if(!array_key_exists('bind_coin_count',$v)) $v['bind_coin_count']=0; if(!array_key_exists('inside_cash_count',$v)) $v['inside_cash_count']=0; $v['promote_account'] = get_promote_name($v['p_id']); - + ($v['promote_account']=='官方渠道')?($v['promote_account']=C('OFFICIEL_CHANNEL')):''; $v['inside_cash_count'] = number_format($v['inside_cash_count'],2,'.',''); $v['allcount'] = number_format($v['cash_count']-0+$v['balance_coin_count']+$v['bind_coin_count'],2,'.',''); $count['cash_count'] += $v['cash_count']; diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php index 2b50f2d39..f015a4e4d 100644 --- a/Application/Admin/Model/PromoteModel.class.php +++ b/Application/Admin/Model/PromoteModel.class.php @@ -464,7 +464,7 @@ class PromoteModel extends Model{ $userAuth = session('user_auth'); setPowerPromoteIds($where,'id'); - $offcialData = [0=>['id'=>0,'nickname'=>'官方渠道']]; + $offcialData = [0=>['id'=>0,'nickname'=>'江息网络']]; $result = $this->field("*")->where($where)->select(); foreach ($result as &$item) {