Prechádzať zdrojové kódy

Merge branch 'order' into test

zqwang 1 rok pred
rodič
commit
17bda237da

+ 4 - 2
modules/Jiesuan/Services/VerifyService.php

@@ -60,14 +60,16 @@ class VerifyService extends BaseService
             $sql->where('bank_cards.created_at', '>=', $param['created_at_start']);
         }
         if (getProp($param, 'created_at_end')) {
-            $sql->where('bank_cards.created_at', "<=", $param['created_at_end']);
+            $end = date("Y-m-d",strtotime($param['created_at_end'])). " 23:59:59";
+            $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, 'checked_at_end')) {
-            $sql->where('bank_cards.checked_at', "<=", $param['checked_at_end']);
+            $end = date("Y-m-d",strtotime($param['checked_at_end'])). " 23:59:59";
+            $sql->where('bank_cards.checked_at', "<=", $end);
         }
         return $sql;
     }