公会订单添加所属商户

Application/Admin/Controller/FinanceController.class.php

@@ -984,6 +984,10 @@ class FinanceController extends ThinkController
             $map['promote_id'] = $_REQUEST['root_id'];
         }
 
+        if ($_REQUEST['merchant_id']){
+            $map['merchant_id'] = $_REQUEST['merchant_id'];
+        }
+
         $promote_id = implode(',',$promote_id);
         if ($promote_id) {
             $map['promote_id'] = ['in',$promote_id];

Application/Admin/Controller/FinancePromoteController.class.php

@@ -784,6 +784,11 @@ class FinancePromoteController extends AdminController
         if (!empty(I('user_nickname'))) {
             $map['game_player_name'] = array('like',I("user_nickname").'%');
         }
+
+        if ($_REQUEST['merchant_id']){
+            $map['merchant_id'] = $_REQUEST['merchant_id'];
+        }
+
         $field = "pay_order_number,FROM_UNIXTIME(payed_time) as pay_time,user_account,user_nickname,game_name,sdk_version,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,market_admin_id,merchant_id";
         $group = "";
         $order = "pay_time DESC";

Application/Admin/View/Finance/gameStatisticsDetail.html

@@ -88,6 +88,15 @@
         </select>
       </div>
 
+      <div class="input-list search_item input-list-gamenoticestatus">
+        <select id="merchant_id" name="merchant_id" class="select_gallery">
+          <option value="0">请选择商户</option>
+          <volist name=":getMerchantList()" id="vo">
+            <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
+          </volist>
+        </select>
+      </div>
+
       <div class="input-list">
 
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/gameStatisticsDetail','model='.$model['name'].'&row='.I('row'),false)}"

Application/Admin/View/FinancePromote/gameStatisticsDetail.html

@@ -148,6 +148,15 @@
         </select>
       </div>
 
+      <div class="input-list search_item input-list-gamenoticestatus">
+        <select id="merchant_id" name="merchant_id" class="select_gallery">
+          <option value="0">请选择商户</option>
+          <volist name=":getMerchantList()" id="vo">
+            <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
+          </volist>
+        </select>
+      </div>
+
       <div class="input-list">
 
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('FinancePromote/gameStatisticsDetail','model='.$model['name'].'&row='.I('row'),false)}"