Merge branch 'order' into test

modules/Channel/Services/Order/OrderService.php

@@ -140,7 +140,11 @@ class OrderService
         }
 
         if (!empty(getProp($param, 'created_at_end'))) {
-            $sql->where('created_at', "<=", $param['created_at_end']);
+            $end =$param['created_at_end'];
+            if ($end == getProp($param,'created_at_start','')){
+                $end = deate("Y-m-d",strtotime($end)) . " 23:59:59";
+            }
+            $sql->where('created_at', "<=", $end);
         }
         return $sql;
     }

modules/OrderRefund/Services/RefundOrderService.php

@@ -119,6 +119,30 @@ class RefundOrderService extends BaseServices
             $sql->where('orders.trade_no', "like", "%" . $param['trade_no'] . "%");
             // $sql->where('orders.trade_no',  $param['trade_no']);
         }
+
+        if (getProp($param,'created_at_start','')){
+            $sql->where('orders_refund_verify.created_at',">=".$param['created_at_start']);
+        }
+        if (getProp($param,'created_at_start','')){
+            $end =$param['created_at_end'];
+            if ($end == getProp($param,'created_at_start','')){
+                $end = deate("Y-m-d",strtotime($end)) . " 23:59:59";
+            }
+            $sql->where('orders_refund_verify.created_at',"<=".$end);
+        }
+
+        if (getProp($param,'checked_at_start','')){
+            $sql->where('orders_refund_verify.checked_at',">=".$param['checked_at_start']);
+        }
+        if (getProp($param,'checked_at_start','')){
+            $end =$param['checked_at_end'];
+            if ($end == getProp($param,'checked_at_start','')){
+                $end = deate("Y-m-d",strtotime($end)) . " 23:59:59";
+            }
+            $sql->where('orders_refund_verify.checked_at',"<=".$end);
+        }
+
+
         return $sql;
     }