平台币增加商户

Application/Admin/Controller/DepositController.class.php

@@ -71,7 +71,10 @@ class DepositController extends ThinkController {
             }
             unset($_REQUEST['pay_way']);
         }
-
+        if ($_REQUEST['merchant_id']) {
+            $map['merchant_id'] = $_REQUEST['merchant_id'];
+            unset($_REQUEST['merchant_id']);
+        }
 
         if(isset($_REQUEST['pay_status'])){
             $map['pay_status']=$_REQUEST['pay_status'];
@@ -213,6 +216,10 @@ class DepositController extends ThinkController {
             $sort = $data_order==3?'desc':'asc';
             $map['order'] = $data_order_type.' '.$sort;
         }
+        if ($_REQUEST['merchant_id']) {
+            $map['merchant_id'] = $_REQUEST['merchant_id'];
+            unset($_REQUEST['merchant_id']);
+        }
 
         $map1=$map;
         $map1['pay_status']=1;
@@ -235,7 +242,7 @@ class DepositController extends ThinkController {
 
         $data = D('coin_pay_order')
             /* 查询指定字段，不指定则查询所有字段 */
-            ->field('*,order_status as pay_status,order_number as pay_order_number')
+            ->field('*,order_status as pay_status,order_number as pay_order_number,merchant_id')
             // 查询条件
             ->where($map)
             /* 默认通过id逆序排列 */

Application/Admin/Controller/TestOrderController.class.php

@@ -47,6 +47,10 @@ class TestOrderController extends ThinkController
             $timeend = strtotime($_REQUEST['timeend'])+86399;
             $map['pay_time'] = array("ELT",$timeend);
         }
+        if ($_REQUEST['merchant_id']) {
+            $map['merchant_id'] = $_REQUEST['merchant_id'];
+            unset($_REQUEST['merchant_id']);
+        }
         $order_list = M('test_order t', 'tab_')
                       ->field("t.*,g.sdk_version")
                       ->join("tab_game g on t.game_id = g.id","left")

Application/Admin/View/Deposit/lists.html

@@ -81,7 +81,14 @@
                     <option value="0">下单未付款</option>
                 </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 search_item input-list-gamenoticestatus">-->
 <!--                <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">-->
 <!--                    <option value="">请选择推广员等级</option>-->
@@ -125,6 +132,7 @@
                     </th>
                     <th>充值方式</th>
                     <th>充值ip</th>
+                    <th>所属商户</th>
                     <th>
                         <a class="paixu" data-order='create_time'>
                             充值时间
@@ -186,6 +194,7 @@
                             <td><span>{$data.pay_amount}</span></td>
                             <td><if condition="$data['pay_way'] neq ''">{:get_pay_way($data['pay_way'])}<else/>无</if></td>
                             <td>{$data.pay_ip}</td>
+                            <td>{:getMerchantName($data['merchant_id'])}</td>
                             <td>{:set_show_time($data['create_time'],'','pay')}</td>
                             <td>
                                 <if condition="$data['pay_status'] eq 1">

Application/Admin/View/Deposit/lists_secord.html

@@ -90,6 +90,14 @@
                     <option value="">请选择推广员</option>
                 </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>
 
             <input type="hidden" name="" value="" class="sortBy">
             <div class="input-list">
@@ -116,6 +124,7 @@
                         </a>
                     </th>
                     <th>充值方式</th>
+                    <th>所属商户</th>
                     <th>
                         <a class="paixu" data-order='create_time'>
                             支付时间
@@ -154,6 +163,7 @@
                             </td>
                             <td><span>{$data.pay_amount}</span></td>
                             <td><if condition="$data['pay_way'] neq ''">{:get_pay_way($data['pay_way'])}<else/>无</if></td>
+                            <td>{:getMerchantName($data['merchant_id'])}</td>
                             <td>{:set_show_time($data['create_time'],'','pay')}</td>
                             <td>
                                 <if condition="$data['pay_status'] eq 1">

Application/Admin/View/Spend/lists.html

@@ -150,7 +150,7 @@
                 <select id="merchant_id" name="merchant_id" class="select_gallery">
                     <option value="0">请选择商户</option>
                     <volist name=":getMerchantList()" id="vo">
-                        <option value="{$vo.id}">{$vo.name}</option>
+                        <option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
                     </volist>
                 </select>
             </div>

Application/Admin/View/TestOrder/lists.html

@@ -87,6 +87,14 @@
           <option value="17" <if condition="$_GET['pay_way']  eq '17'">selected</if>>易宝支付</option>
         </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('TestOrder/lists','model='.$model['name'].'&row='.I('row'),false)}" style="">搜索</a>
@@ -130,6 +138,8 @@
 
           <th >充值方式</th>
 
+          <th>所属商户</th>
+
           <th >录入时间</th>
 
           <th >操作</th>
@@ -161,6 +171,7 @@
               <td >{$data.order_amount}</td>
               <td >{$data.pay_amount}</td>
               <td >{$data.pay_way|get_pay_way}</td>
+              <td>{:getMerchantName($data['merchant_id'])}</td>
               <td >{$data.add_time|date='Y-m-d H:i:s',###}</td>
               <td ><a class="confirm del" data-id="{$data.id}">删除</a></td>
             </tr>