Merge branch 'order' into test

modules/Channel/Services/Order/OrderService.php

@@ -44,7 +44,7 @@ class OrderService
                 $val->play_name = '-';
                 $company = Miniprogram::where('id', $val->miniprogram_id)->first();
                 if ($company) {
-                    $val->company_name = $val->puser_id >  0 ? DB::table('users')->where('id',$val->puser_id)->value("username") : "-";
+                    $val->company_name = $val->puser_id >  0 ? DB::table('users')->where('id',$val->puser_id)->value("username") : "-"; 
                     $val->play_name = $company->play_name;
                     $val->xcx_name = $company->name;
                 }

modules/Jiesuan/Services/VerifyService.php

@@ -64,12 +64,12 @@ class VerifyService extends BaseService
             $sql->where('bank_cards.created_at', "<=", $end);
         }
         // 审核时间
-        if (getProp($param, 'checked_at_start')) {
-            $sql->where('bank_cards.checked_at', '>=', $param['checked_at_start']);
+        if (getProp($param, 'pay_at_start')) {
+            $sql->where('bank_cards.pay_at_at', '>=', $param['pay_at_start']);
         }
-        if (getProp($param, 'checked_at_end')) {
-            $end = date("Y-m-d",strtotime($param['checked_at_end'])). " 23:59:59";
-            $sql->where('bank_cards.checked_at', "<=", $end);
+        if (getProp($param, 'pay_at_end')) {
+            $end = date("Y-m-d",strtotime($param['pay_at_end'])). " 23:59:59";
+            $sql->where('bank_cards.pay_at', "<=", $end);
         }
         return $sql;
     }