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

提现汇总表时间检索bug修正

Application/Admin/Controller/MarketPercentageController.class.php

@@ -617,6 +617,18 @@ class MarketPercentageController extends ThinkController
                 $map['pay_time'] = ['in', $search_date];
             }
         }
+        if($_REQUEST['pay_time']) {
+            if (in_array($_REQUEST['pay_time'],$search_date)) {
+                $map['pay_time'] = $_REQUEST['pay_time'];
+            } elseif(isset($_REQUEST['time_start']) || isset($_REQUEST['time_end'])) {
+                $this->checkListOrCountAuthRestMap($map,[]);
+                $this->assign("list_data",[]);
+                $this->display("showbonuslist");
+                die();
+            } else {
+                $map['pay_time'] = $_REQUEST['pay_time'];
+            }
+        }
 
         $data = M("market_altogether","tab_")
             ->field("max(pay_time) pay_time,real_name,admin_id,nickname,level,sum(pay_amount) pay_amount,sum(extend_commission) extend_commission,