From a960e0a7e4c369293a1424f324bd27e6759ec6ef Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 28 Jul 2020 14:11:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=95=86=E6=88=B7bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/extend.php           | 22 ++++--
 .../PayMerchantController.class.php           | 18 +++--
 .../Controller/TestOrderController.class.php  |  8 ---
 Application/Admin/View/PayChannel/index.html  |  4 +-
 Application/Admin/View/PayMerchant/index.html |  7 +-
 .../Admin/View/TestOrder/addOrder.html        | 70 ++++++++++++++-----
 6 files changed, 85 insertions(+), 44 deletions(-)

diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index a0971e61d..cb86086db 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -2847,12 +2847,22 @@ function throwPromoteIdToCompanyId($p_ids)
  * @param $type
  * @return mixed
  */
-function getMerchant(){
+function getMerchant($type = 0){
 
-    $data = M('payment_merchant','tab_')
-        ->field("id,name,identifier,account,main_name")
-        ->where(['status'=>1,'type'=>1])
-        ->select();
+
+
+    if ($type) {
+        $data = M('payment_merchant','tab_')
+            ->field("id,name,identifier,account,main_name")
+            ->where(['status'=>1,'type'=>1])
+            ->group("main_name")
+            ->select();
+    } else {
+        $data = M('payment_merchant','tab_')
+            ->field("id,name,identifier,account,main_name")
+            ->where(['status'=>1,'type'=>1])
+            ->select();
+    }
 
     return $data;
 }
@@ -2885,7 +2895,7 @@ function getCpCompanySelect($type = 1){
  */
 function getMerchantList($type = 1){
 
-    $data = M("payment_merchant","tab_")->field("id,name")->select();
+    $data = M("payment_merchant","tab_")->field("id,name,ways")->select();
 
     return $data;
 }
diff --git a/Application/Admin/Controller/PayMerchantController.class.php b/Application/Admin/Controller/PayMerchantController.class.php
index 60110955e..34a592390 100644
--- a/Application/Admin/Controller/PayMerchantController.class.php
+++ b/Application/Admin/Controller/PayMerchantController.class.php
@@ -15,9 +15,9 @@ class PayMerchantController extends ThinkController
     const WAY_EXPRESS = 4;
 
     public function index($p = 0) {
-//        if(!array_key_exists("timestart",$_REQUEST)){
-//            $this->redirect(ACTION_NAME, array('timestart' => date('Y-m-d',strtotime('-30 day')),"timeend"=>date('Y-m-d')));
-//        }
+        if(!array_key_exists("timestart",$_REQUEST)){
+            $this->redirect(ACTION_NAME, array('timestart' => date('Y-m-d',strtotime('-30 day')),"timeend"=>date('Y-m-d')));
+        }
         $page = intval($p);
         $page = $page ? $page : 1; //默认显示第一页数据
         $arraypage = $page;
@@ -156,7 +156,7 @@ class PayMerchantController extends ThinkController
                 ->group("merchant_id,merchant_way")
                 ->select();
         }
-
+//        dump($data);die();
         $count = M()->table("({$sql})a")
             ->field("merchant_id")
             ->where("name is not null and merchant_way !=0")
@@ -187,7 +187,7 @@ class PayMerchantController extends ThinkController
         $sum['offcial_amount'] = round ($sum['offcial_amount'],2);
         $sum['spread_amount'] = round ($sum['spread_amount'],2);
         $sum['offcial_amount'] = round ($sum['supersign_amount'],2);
-        $sum['spread_amount'] = round ($sum['test_order_amount'],2);
+        $sum['test_order_amount'] = round ($sum['test_order_amount'],2);
 
 
         $sum['sum'] = $sum['cash_amount']+$sum['test_amount']+$sum['coin_amount']+$sum['offcial_amount']
@@ -207,6 +207,14 @@ class PayMerchantController extends ThinkController
                 $value['offcial_amount']+$value['spread_amount']+$value['supersign_amount']+$value['test_order_amount'];
             $data[$key]['ratio'] = round (($data[$key]['sum']/array_sum(array_column($sum_merchant,'sum_amount')))*100,2);
 
+            $data[$key]['cash_amount'] = number_format($value['cash_amount'],2,'.','');
+            $data[$key]['test_amount'] = number_format ($value['test_amount'],2,'.','');
+            $data[$key]['coin_amount'] = number_format ($value['coin_amount'],2,'.','');
+            $data[$key]['offcial_amount'] = number_format ($value['offcial_amount'],2,'.','');
+            $data[$key]['spread_amount'] = number_format ($value['spread_amount'],2,'.','');
+            $data[$key]['offcial_amount'] = number_format ($value['supersign_amount'],2,'.','');
+            $data[$key]['test_order_amount'] = number_format ($value['test_order_amount'],2,'.','');
+
             if ($value['merchant_way'] == self::WAY_ALIPAY) {
                 $data[$key]['merchant_way'] = "支付宝";
             } else if ($value['merchant_way'] == self::WAY_WEIXIN) {
diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php
index f8fc41845..0141a6507 100644
--- a/Application/Admin/Controller/TestOrderController.class.php
+++ b/Application/Admin/Controller/TestOrderController.class.php
@@ -91,14 +91,6 @@ class TestOrderController extends ThinkController
             $this->ajaxReturn(['status'=>0,'msg'=>'订单重复录入']);
         }
 
-        if ($data['pay_way'] == 1) {
-            $data['merchant_way'] = 1;
-        } else if($data['pay_way'] == 2||$data['pay_way'] == 3) {
-            $data['merchant_way'] = 2;
-        } else {
-            $data['merchant_way'] = 4;
-        }
-
         $isSuccess = M('test_order','tab_')->add($data);
 
         if ($isSuccess) {
diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html
index 60411cadc..203ba130f 100644
--- a/Application/Admin/View/PayChannel/index.html
+++ b/Application/Admin/View/PayChannel/index.html
@@ -146,9 +146,9 @@
 
           <th ><div class="tooltip">平台币直充金额<span class="tooltiptext"><span style="margin-left: -10px">玩家在游戏内充值到SDK(余额-平台币)内平台币的金额</span></span></div></th>
 
-          <th ><div class="tooltip">测试白名单测试金额<span class="tooltiptext"><span style="margin-left: -10px">测试白名单下测试账号所产生的测试金额。只展示充值成功的订单</span></span></div></th>
+          <th ><div class="tooltip">测试白名单金额<span class="tooltiptext"><span style="margin-left: -10px">测试白名单下测试账号所产生的测试金额。只展示充值成功的订单</span></span></div></th>
 
-          <th ><div class="tooltip">支付渠道内合计<span class="tooltiptext"><span style="margin-left: -10px">超级签金额+游戏现金金额+平台币直充+测试金额</span></span></div></th>
+          <th ><div class="tooltip">支付商户内统计<span class="tooltiptext"><span style="margin-left: -10px">超级签金额+游戏现金金额+平台币直充+测试金额</span></span></div></th>
 
           <th >操作</th>
         </tr>
diff --git a/Application/Admin/View/PayMerchant/index.html b/Application/Admin/View/PayMerchant/index.html
index 88e35f701..0d152ab8d 100644
--- a/Application/Admin/View/PayMerchant/index.html
+++ b/Application/Admin/View/PayMerchant/index.html
@@ -110,7 +110,7 @@
       <div class="input-list input-list-game search_label_rehab">
         <select id="main_name" name="main_name" class="select_gallery" >
           <option value="">请选择商户主体</option>
-          <volist name=":getMerchant()" id="vo">
+          <volist name=":getMerchant(1)" id="vo">
             <option value="{$vo.main_name}" <if condition="$vo.main_name eq I('main_name')">selected</if> >{$vo.main_name}</option>
           </volist>
         </select>
@@ -205,8 +205,7 @@
           <volist name="listdata" id="data">
             <tr>
               <td>{$data.main_name|default = '无'}</td>
-              <td >{$data.name|default = '无'}
-<!--                -{$data.merchant_way|default = '无'}-->
+              <td >{$data.name|default = '无'}({$data.merchant_way|default = '无'})
               </td>
               <td >{$data.account|default = ''}</td>
 <!--              <td >{$data['channel']|default = ''}</td>-->
@@ -243,7 +242,7 @@
               无
             </if>
             <volist name="sum_merchant" id="sum_merchant">
-              {$sum_merchant.name}:{$sum_merchant.sum_amount|default = '0.00'} &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+              {$sum_merchant.name}({$sum_merchant.merchant_way}):{$sum_merchant.sum_amount|default = '0.00'} &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
             </volist>
           </td>
         </tr>
diff --git a/Application/Admin/View/TestOrder/addOrder.html b/Application/Admin/View/TestOrder/addOrder.html
index 192908df3..0f60b05c4 100644
--- a/Application/Admin/View/TestOrder/addOrder.html
+++ b/Application/Admin/View/TestOrder/addOrder.html
@@ -132,35 +132,44 @@
                 </td>
             </tr>
             <tr>
-                <td class="l">充值方式:</td>
-                <td class="r">
-                    <select id="pay_way" name="pay_way" class="select_gallery">
-                        <option value="1">支付宝</option>
-                        <option value="2">微信(扫码)</option>
-                        <option value="3">微信app</option>
-                        <option value="4">威富通</option>
-                        <option value="5">聚宝云</option>
-                        <option value="6">竣付通</option>
-                        <option value="7">金猪</option>
-                        <option value="9">双乾支付-支付宝</option>
-                        <option value="10">双乾支付-银联</option>
-                        <option value="15">双乾支付-快捷</option>
-                        <option value="0">平台币</option>
-                        <option value="-1">绑币</option>
-                        <option value="17">易宝支付</option>
-                    </select>
-                </td>
+              <td class="l">充值方式:</td>
+              <td class="r">
+                <select id="pay_way" name="pay_way" class="select_gallery">
+                  <option value="1">支付宝</option>
+                  <option value="2">微信(扫码)</option>
+                  <option value="3">微信app</option>
+                  <option value="4">威富通</option>
+                  <option value="5">聚宝云</option>
+                  <option value="6">竣付通</option>
+                  <option value="7">金猪</option>
+                  <option value="9">双乾支付-支付宝</option>
+                  <option value="10">双乾支付-银联</option>
+                  <option value="15">双乾支付-快捷</option>
+                  <option value="0">平台币</option>
+                  <option value="-1">绑币</option>
+                  <option value="17">易宝支付</option>
+                </select>
+              </td>
             </tr>
             <tr>
                 <td class="l">充值商户:</td>
                 <td class="r">
                     <select id="merchant_id" name="merchant_id" class="select_gallery">
                         <volist name=":getMerchantList()" id="vo">
-                            <option value="{$vo.id}">{$vo.name}</option>
+                            <option value="{$vo.id}" data-way="{$vo.ways}">{$vo.name}</option>
                         </volist>
                     </select>
                 </td>
             </tr>
+            <tr>
+                <td class="l">商户充值方式:</td>
+                <td class="r">
+                    <select id="merchant_way" name="merchant_way" class="select_gallery">
+                        <option value=''>请选择商户支付方式</option>
+                    </select>
+                </td>
+            </tr>
+
 
             <tr>
                 <td class="l">充值时间:</td>
@@ -226,6 +235,29 @@
 </script>
 
 <script type="text/javascript">
+
+    $("#merchant_id").change(function () {
+        var way = $("#merchant_id option:selected").attr("data-way");
+        var ways = [];
+        var option = '';
+        ways[1] = '支付宝';
+        ways[2] = '微信';
+        ways[4] = '快捷支付';
+        $("#merchant_way").empty();
+        $("#merchant_way").append("<option value=''>请选择商户支付方式</option>");
+
+        ways.forEach(function(val,index,ways){
+            if ((way & index) == index) {
+                option = "<option value='"+index+"'>"+ways[index]+"</option>";
+                $("#merchant_way").append(option);
+            }
+
+        });
+
+
+    });
+    $("#merchant_id").change();
+
     //搜索功能
     $("#jssearch").click(function(){
         var starttime = $.trim($('#time-start').val());

From 9d28947f9b1e0862c8bccd26150517174b85637e Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 28 Jul 2020 14:43:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E6=88=B7bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/PayChannel/index.html  | 18 +++++++++---------
 Application/Admin/View/PayMerchant/index.html |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html
index 203ba130f..0ab955bca 100644
--- a/Application/Admin/View/PayChannel/index.html
+++ b/Application/Admin/View/PayChannel/index.html
@@ -137,21 +137,21 @@
       <table>
         <!-- 表头 -->
         <thead>
-        <tr>
+          <tr>
 
-          <th ><div class="tooltip">产品名称<span class="tooltiptext"><span style="margin-left: -10px">平台官网,超级签,游戏等等产品</span></span></div></th>
-          <th ><div class="tooltip">设备名称<span class="tooltiptext"><span style="margin-left: -10px">游戏的设备名称</span></span></div></th>
+            <th ><div class="tooltip">产品名称<span class="tooltiptext"><span style="margin-left: -10px">平台官网,超级签,游戏等等产品</span></span></div></th>
+            <th ><div class="tooltip">设备名称<span class="tooltiptext"><span style="margin-left: -10px">游戏的设备名称</span></span></div></th>
 
-          <th ><div class="tooltip">游戏现金金额<span class="tooltiptext"><span style="margin-left: -10px">第三方支付充值到游戏的金额</span></span></div></th>
+            <th ><div class="tooltip">游戏现金金额<span class="tooltiptext"><span style="margin-left: -10px">第三方支付充值到游戏的金额</span></span></div></th>
 
-          <th ><div class="tooltip">平台币直充金额<span class="tooltiptext"><span style="margin-left: -10px">玩家在游戏内充值到SDK(余额-平台币)内平台币的金额</span></span></div></th>
+            <th ><div class="tooltip">平台币直充金额<span class="tooltiptext"><span style="margin-left: -10px">玩家在游戏内充值到SDK(余额-平台币)内平台币的金额</span></span></div></th>
 
-          <th ><div class="tooltip">测试白名单金额<span class="tooltiptext"><span style="margin-left: -10px">测试白名单下测试账号所产生的测试金额。只展示充值成功的订单</span></span></div></th>
+            <th ><div class="tooltip">测试白名单金额<span class="tooltiptext"><span style="margin-left: -10px">测试白名单下测试账号所产生的测试金额。只展示充值成功的订单</span></span></div></th>
 
-          <th ><div class="tooltip">支付商户内统计<span class="tooltiptext"><span style="margin-left: -10px">超级签金额+游戏现金金额+平台币直充+测试金额</span></span></div></th>
+            <th ><div class="tooltip">支付商户内统计<span class="tooltiptext"><span style="margin-left: -10px">超级签金额+游戏现金金额+平台币直充+测试金额</span></span></div></th>
 
-          <th >操作</th>
-        </tr>
+            <th >操作</th>
+          </tr>
         </thead>
         <!-- 列表 -->
         <tbody>
diff --git a/Application/Admin/View/PayMerchant/index.html b/Application/Admin/View/PayMerchant/index.html
index 0d152ab8d..b56cf5b9a 100644
--- a/Application/Admin/View/PayMerchant/index.html
+++ b/Application/Admin/View/PayMerchant/index.html
@@ -186,7 +186,7 @@
           <th >超级签</th>
           <th >官网</th>
           <th >推广后台</th>
-          <th >支付渠道内合计</th>
+          <th >支付商户内合计</th>
         </tr>
         </thead>
         <!-- 列表 -->

From eebb38dc8c6306ed212ceabd4d28a8543032f160 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 28 Jul 2020 14:54:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Finance/payTypeStatistics.html | 2 +-
 Application/Admin/View/PayChannel/index.html          | 2 +-
 Application/Admin/View/PayMerchant/index.html         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/View/Finance/payTypeStatistics.html b/Application/Admin/View/Finance/payTypeStatistics.html
index 35a1658cf..a4ec034f3 100644
--- a/Application/Admin/View/Finance/payTypeStatistics.html
+++ b/Application/Admin/View/Finance/payTypeStatistics.html
@@ -76,7 +76,7 @@
     <div class="fr">
       <a class="" href="{:U('PayChannel/index')}">游戏充值统计</a>
       <a class="tabchose" href="">充值方式统计</a>
-      <a href="{:U('PayMerchant/index')}">充值方式统计</a>
+      <a href="{:U('PayMerchant/index')}">支付方式统计</a>
 
     </div>
   </div>
diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html
index 0ab955bca..3c6591067 100644
--- a/Application/Admin/View/PayChannel/index.html
+++ b/Application/Admin/View/PayChannel/index.html
@@ -75,7 +75,7 @@
     <div class="fr">
       <a class="tabchose" href="">游戏充值统计</a>
       <a class="" href="{:U('Finance/payTypeStatistics')}">充值方式统计</a>
-      <a class="" href="{:U('PayMerchant/index')}">收款商户统计</a>
+      <a class="" href="{:U('PayMerchant/index')}">支付方式统计</a>
     </div>
   </div>
 
diff --git a/Application/Admin/View/PayMerchant/index.html b/Application/Admin/View/PayMerchant/index.html
index b56cf5b9a..67ef204cd 100644
--- a/Application/Admin/View/PayMerchant/index.html
+++ b/Application/Admin/View/PayMerchant/index.html
@@ -75,7 +75,7 @@
     <div class="fr">
       <a href="PayChannel/index">游戏充值统计</a>
       <a class="" href="{:U('Finance/payTypeStatistics')}">充值方式统计</a>
-      <a class="tabchose">收款商户统计</a>
+      <a class="tabchose">支付方式统计</a>
     </div>
   </div>