Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	Data/update.sql

Application/Home/Controller/DownloadController.class.php

@@ -36,6 +36,11 @@ class DownloadController extends BaseController {
         1 => '汇款中',
         2 => '已汇款',
     ];
+
+    public static $payStatus = [
+        0 => '下单未支付',
+        1 => '充值成功',
+    ];
     
     /**
     * excel
@@ -1204,9 +1209,15 @@ class DownloadController extends BaseController {
         empty(I('game_player_name')) || $map['tab_spend.game_player_name'] = ['like', '%' . I('game_player_name') . '%'];
         empty(I('user_account')) || $map['tab_spend.user_account'] = ['like', '%' . I('user_account') . '%'];
         empty(I('pay_order_number')) || $map['tab_spend.pay_order_number'] = I('pay_order_number');
-        $map['tab_spend.pay_status'] = 1;
+        // $map['tab_spend.pay_status'] = 1;
         $map['tab_spend.is_check'] = ['neq', 2];
-        
+        if (isset($_REQUEST['pay_status']) && $_REQUEST['pay_status'] !== '') {
+            $payStatus = intval(I('pay_status'));
+
+            if (in_array($payStatus, array_keys(self::$payStatus))) {
+                $map['tab_spend.pay_status'] = $payStatus;
+            }
+        }
         $conditions = json_encode($map,TRUE);           
          $addtime = time();
          $data = [
@@ -3114,7 +3125,9 @@ class DownloadController extends BaseController {
             '游戏订单',
             '订单金额',
             '支付方式',
+            '充值状态',
             '游戏名称',
+            '设备类型',
             '区服',
             '角色名',
             '部门长',
@@ -3184,6 +3197,8 @@ class DownloadController extends BaseController {
                  // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12);
                  $value1['user_account'] = $this->encryption($value1['user_account']);
                  $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']);
+                 $value1['pay_status'] = isset(self::$payStatus[$value1['pay_status']]) ? self::$payStatus[$value1['pay_status']] : "未知状态";
+                 $value1['sdk_version'] = getSDKTypeName($value1['sdk_version']);
                  switch ($value1['level']) {
                      case 3:
                          $value1['p_p_pro_account'] = $promoteData[$value1['parent_id']]['account'];
@@ -3212,7 +3227,9 @@ class DownloadController extends BaseController {
                  $csvData["pay_order_number"] = $value1["pay_order_number"];
                  $csvData["pay_amount"] = $value1["pay_amount"];
                  $csvData["pay_way"] = $value1["pay_way"];
+                 $csvData['pay_status'] = $value1['pay_status'];
                  $csvData["game_name"] = $value1["game_name"];
+                 $csvData["sdk_version"] = $value1['sdk_version'];
                  $csvData["server_name"] = $value1["server_name"];
                  $csvData["game_player_name"] = $value1["game_player_name"];
                  $csvData["p_p_proinfo"] = $value1["p_p_proinfo"];
@@ -3239,7 +3256,9 @@ class DownloadController extends BaseController {
          $csvData1["pay_order_number"] = "--";
          $csvData1["pay_amount"] = $income;
          $csvData1["pay_way"] = "--";
+         $csvData1['pay_status'] = "--";
          $csvData1["game_name"] = "--";
+         $csvData1["sdk_version"] = "--";
          $csvData1["server_name"] = "--";
          $csvData1["game_player_name"] = "--";
          $csvData1["p_p_proinfo"] = "--";

Application/Home/Controller/HomeController.class.php

@@ -218,7 +218,7 @@ class HomeController extends Controller
         $game['screenshot'] = $screenshotUrls;
 
         $isNewIos = false;
-         if ($gameSource['is_new_sdk'] == 1) {
+        if ($gameSource['is_new_sdk'] == 1) {
             $isNewIos = true;
         }
 

Application/Home/View/default/Query/recharge.html

@@ -227,6 +227,7 @@
                 <td>合计</td>
                 <td>--</td>
                 <td>--</td>
+                <td>--</td>
                 <td>{$income}</td>
                 <td>--</td>
                 <td>--</td>

Data/update.sql

@@ -617,9 +617,6 @@ MODIFY COLUMN `type`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '类型 0
 -- user表注册类型添加7虚拟
 ALTER TABLE `tab_user` MODIFY COLUMN `register_type` tinyint(2) DEFAULT '1' COMMENT '注册方式 0游客1账号 2 手机 3微信 4QQ 5百度 6微博 7虚拟';
 
-ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)';
-
-
 --游戏评分字段改为保留小数1位  2019-12-03 郑昌隆---
 ALTER TABLE tab_game MODIFY COLUMN `game_score` double(3,1) DEFAULT '0' COMMENT '游戏评分';
 
@@ -656,4 +653,6 @@ VALUES ('ServerNotice', '游戏区服预告', '0', '', '1', '{\"1\":[\"289\",\"2
 --游戏表新增字段-落地页视频  liuweiwen 2019-12-09
 ALTER TABLE tab_game ADD `flooring_page_video` varchar(150) NOT NULL DEFAULT '' COMMENT '落地页视频';
 ALTER TABLE tab_game ADD `supersign_status` tinyint(1) DEFAULT '1' COMMENT '超级签开关：1-开启；0-关闭';
-ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落地页视频是否置顶：1-置顶；0-不置顶';
+
+-- 新旧IOS打包标识
+ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)';