Merge remote-tracking branch 'origin/dev' into dev

app/common/dao/merchant/order/OrderMerchantDao.php

@@ -62,7 +62,12 @@ class OrderMerchantDao extends BaseDao
     public function merchantSearch($merId, array $where, $sysDel = 0)
     {
         return OrderMerchant::getDB()
-            ->where('mer_id', $merId)
+            ->when($merId, function ($query, $merId) {
+                $query->where('mer_id', $merId);
+            })
+            ->when(!$merId && isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) {
+                $query->where('mer_id', $where['mer_id']);
+            })
             ->when(isset($where['date']) && $where['date'] !== '', function ($query) use ($where) {
                 getModelTime($query, $where['date']);
             })

app/common/repositories/merchant/order/OrderMerchantRepository.php

@@ -158,7 +158,9 @@ class OrderMerchantRepository extends BaseRepository
         $query = $this->dao->merchantSearch($merId, $where);
         $query1 = $this->dao->merchantSearch($merId, $where);
         $statistics = $query1->field('sum(money) money,sum(available) available,sum(swipe_fee) swipe_fee')
-            ->where('mer_id', $merId)
+            ->when($merId, function ($query, $merId) {
+                $query->where('mer_id', $merId);
+            })
             ->where('paid', 1)
             ->whereNull('refund_time')
             ->find();