市场结算管理设备类型条件修正

Application/Admin/Controller/QueryController.class.php

@@ -1470,14 +1470,16 @@ class QueryController extends ThinkController
         }
 
         if ($_REQUEST['device']) {
-            $map['game_name'] = ['like','%'.$_REQUEST['device'].'%'];
+//            $map['tab_spend.sdk_version'] = $_REQUEST['device'];
-        }
+            $spendMap['tab_spend.sdk_version'] = $_REQUEST['device'];
 
+        }
+        $spendMap['pay_status'] = 1;
         //获取spend表中的数据，同时根据会长id进行group分类
         $data = M('Spend','tab_')
             ->field("FROM_UNIXTIME(pay_time,'%Y-%m') as my_time,sum(pay_amount) as pay_amount,game_id,game_name,SUBSTRING_INDEX(`game_name`,\"(\",1) as game_names,promote_id,promote_account,company_relation,company_belong,CASE WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(`chain`,\"/\",2),\"/\",-1)='' THEN promote_id ELSE SUBSTRING_INDEX(SUBSTRING_INDEX(`chain`,\"/\",2),\"/\",-1) END as root_id ")
             ->join("left join tab_promote on promote_id = tab_promote.id")
-            ->where(['pay_status'=>1])
+            ->where($spendMap)
             ->group("my_time,game_names,root_id")
             ->order("my_time Desc")
             ->select(false);

Application/Admin/View/Query/marketList.html

@@ -111,8 +111,8 @@
             <div class="input-list input-list-game search_label_rehab">
                 <select name="device" class="select_gallery">
                     <option value="">设备类型</option>
-                    <option value="安卓版">安卓</option>
+                    <option value="1">安卓</option>
-                    <option value="苹果版">IOS</option>
+                    <option value="2">IOS</option>
                 </select>
             </div>
             <input type="hidden" name="" value="" class="sortBy">