From c054595a94ccf55e515df18092a904a9101d46d9 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Fri, 27 Dec 2019 13:47:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=88=86=E4=BA=ABbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/HomeController.class.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 0c8145339..aaed98006 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -42,7 +42,13 @@ class HomeController extends Controller $secret = 'd3219c70a45c5e1954be4608b288d38b'; $tokenUrl = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=' . $appid . '&secret=' . $secret; - $content = file_get_contents(RUNTIME_PATH . 'Data/wechat_ticket'); + $tempDataDir = RUNTIME_PATH . 'Data'; + if(!is_dir($tempDataDir)) { + @mkdir($tempDataDir); + } + + $content = file_get_contents($tempDataDir . '/wechat_ticket'); + $ticketData = null; if ($content) { $ticketData = json_decode($content, true); From b88f395c9a4f5b45a7e447ffc5ddb3b88f882982 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Fri, 27 Dec 2019 14:05:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A5=E5=8D=95=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/BehaviorLogController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 5306bc473..ddfb070e8 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -130,13 +130,13 @@ class BehaviorLogController extends ThinkController $show_data = []; foreach($data as $k => $v) { if($v['tab'] == 'spend') { - $order_detail = M('spend', 'tab_')->field('order_number,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); + $order_detail = M('spend', 'tab_')->field('extend,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = $order_detail['pay_time']; } elseif($v['tab'] == 'deposit') { $order_detail = M('deposit', 'tab_')->field('order_number,create_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = $order_detail['create_time']; } - $re_data['order_number'] = !empty($order_detail['order_number']) ? $order_detail['order_number'] : '-'; + $re_data['order_number'] = isset($order_detail['extend']) ? $order_detail['extend'] : '-'; $re_data['user_account'] = $order_detail['user_account']; $re_data['promote_account'] = $order_detail['promote_account']; $re_data['game_name'] = !empty($order_detail['game_name']) ? $order_detail['game_name'] : '-';