From e7cd32b2a22e96a2a86ac36533dd4866cc198a52 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 1 Dec 2020 14:30:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/SpendController.class.php | 6 +----- Application/Admin/Model/SpendModel.class.php | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index efec7a82b..15416f9c9 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -11,10 +11,6 @@ use User\Api\UserApi as UserApi; class SpendController extends ThinkController { const model_name = 'Spend'; - const IsCheckStr=[ - "1"=>"是", - "2"=>"否" - ]; public $OpAuthList; public function lists() @@ -156,7 +152,7 @@ class SpendController extends ThinkController foreach ($data['data'] as $key=>&$value ) { ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):''; $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无'; - $value['is_check_str'] = self::IsCheckStr[$value['is_check']]; + $value['is_check_str'] = D(self::model_name)::IsCheckStr[$value['is_check']]; } $this->assign('showMarketAdmin', session('user_auth')['show_market_admin']); $this->assign('showPromote', session('user_auth')['show_promote']); diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php index 2d9c51ed7..3153c7efc 100644 --- a/Application/Admin/Model/SpendModel.class.php +++ b/Application/Admin/Model/SpendModel.class.php @@ -22,6 +22,10 @@ class SpendModel extends Model /* 自动验证规则 */ protected $_validate = array(); + const IsCheckStr=[ + "1"=>"是", + "2"=>"否" + ]; /* 自动完成规则 */ protected $_auto = array( From a20285a42e20a6f6564f51991d9d332e2067c2cc Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 1 Dec 2020 18:30:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E7=BB=93=E7=AE=97=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 4ef21467d..fd0f58f99 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -1135,6 +1135,11 @@ class ExportController extends Controller unset($_REQUEST['pay_way']); } + if (isset($_REQUEST['is_check'])) { + $map['is_check'] = (int)($_REQUEST['is_check']); + unset($_REQUEST['is_check']); + } + if ($_REQUEST['merchant_id']) { $map['merchant_id'] = $_REQUEST['merchant_id']; unset($_REQUEST['merchant_id']); @@ -1229,6 +1234,7 @@ class ExportController extends Controller 'pay_way' => '充值方式', 'pay_status' => L('Order_status'), 'pay_game_status' => '游戏通知状态', + 'is_check' => '是否参与结算', 'promote_id' => "消费"."{$total}", ]; @@ -1304,6 +1310,8 @@ class ExportController extends Controller $value['sdk_version'] = $value['sdk_version'] == 1 ? "安卓" : "苹果"; $value['game_id'] = $thisGameInfo['partner_name']; + $value['is_check'] = D("Spend")::IsCheckStr[$value['is_check']]; + $value['company_name'] = $promoters[$value['promote_id']] == 0 ? '官方渠道' : ($companys[$promoters[$value['promote_id']]] ?? ''); unset($value['promote_id']); $value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']);