Merge branch 'hotfix/market_percentage' of wmtx/platform into release

商户bug修改

Application/Admin/Controller/FinancialSummaryController.class.php

@@ -59,7 +59,7 @@ class FinancialSummaryController extends AdminController
         );
 
         $merchant_data = M("payment_merchant","tab_")
-            ->field("identifier,main_name")
+            ->field("identifier,name")
             ->where(['status'=>1,'type'=>1])
             ->select();
 
@@ -67,7 +67,7 @@ class FinancialSummaryController extends AdminController
         foreach ($merchant_data as $key => $value) {
 
             $identifier = (string)$value['identifier'];
-            $this->keyname[$identifier] = $value['main_name'];
+            $this->keyname[$identifier] = $value['name'];
         }
 
         $data = [];

Application/Admin/Controller/PayMerchantController.class.php

@@ -159,11 +159,12 @@ class PayMerchantController extends ThinkController
 
         $count = M()->table("({$sql})a")
             ->field("merchant_id")
-            ->page($p, $row)
             ->where("name is not null and merchant_way !=0")
 //            ->where($map)
             ->group("merchant_id,merchant_way")
-            ->count();
+            ->select(false);
+
+        $count = M()->table("({$count})b")->count();
 
         $page = set_pagination($count, $row);
         if ($page) {

Application/Admin/View/TestOrder/addOrder.html

@@ -152,7 +152,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="l">充值方式：</td>
+                <td class="l">充值商户：</td>
                 <td class="r">
                     <select id="merchant_id" name="merchant_id" class="select_gallery">
                         <volist name=":getMerchantList()" id="vo">