Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0

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'] : '-';

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);