소스 검색

Merge branch 'order' into test

zqwang 1 년 전
부모
커밋
2c39f3fcb7
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      modules/Channel/Services/Order/OrderService.php
  2. 1 1
      modules/OrderRefund/Services/RefundOrderService.php

+ 1 - 1
modules/Channel/Services/Order/OrderService.php

@@ -142,7 +142,7 @@ class OrderService
         if (!empty(getProp($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";
+                $end = date("Y-m-d",strtotime($end)) . " 23:59:59";
             }
             $sql->where('created_at', "<=", $end);
         }

+ 1 - 1
modules/OrderRefund/Services/RefundOrderService.php

@@ -137,7 +137,7 @@ class RefundOrderService extends BaseServices
         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";
+                $end = date("Y-m-d",strtotime($end)) . " 23:59:59";
             }
             $sql->where('orders_refund_verify.checked_at',"<=".$end);
         }