Merge branch 'order' into test

modules/Channel/Services/Order/OrderService.php

@@ -132,6 +132,10 @@ class OrderService
             $sql->where('pay_end_at', $param['pay_end_at_start']);
         }
         if (!empty(getProp($param, 'pay_end_at_end'))) {
+            $end =$param['pay_end_at_end'];
+            if ($end == getProp($param,'pay_end_at_start','')){
+                $end = date("Y-m-d",strtotime($end)) . " 23:59:59";
+            }
             $sql->where('pay_end_at', "<=", $param['pay_end_at_end']);
         }
         // 创建时间