Forráskód Böngészése

fix notify_time condition from elt to lt

stanley-king 3 éve
szülő
commit
248793814b
2 módosított fájl, 3 hozzáadás és 3 törlés
  1. 1 1
      admin/control/refill_order.php
  2. 2 2
      helper/task/handler.php

+ 1 - 1
admin/control/refill_order.php

@@ -141,7 +141,7 @@ class refill_orderControl extends SystemControl
             $cond['refill_order.order_time'] = [['egt', $start], ['lt', $end], 'and'];
 
             [$start,$end] = $scope['add_time'];
-            $cond['vr_order.add_time'] = [['egt', $start], ['lt', $end], 'and'];
+            $cond['vr_order.add_time'] = [['egt', $start], ['elt', $end], 'and'];
 
             if(isset($scope['notify_time'])) {
                 [$start,$end] = $scope['notify_time'];

+ 2 - 2
helper/task/handler.php

@@ -67,14 +67,14 @@ class handler
                 $cond['refill_order.order_time'] = [['egt', $start], ['lt', $end], 'and'];
 
                 [$start, $end] = $time_scope['add_time'];
-                $cond['vr_order.add_time'] = [['egt', $start], ['lt', $end], 'and'];
+                $cond['vr_order.add_time'] = [['egt', $start], ['elt', $end], 'and'];
 
                 $cond['refill_order.notify_time'] = [['egt', $cur_start], ['lt', $cur_end], 'and'];
             } else {
                 $cond['refill_order.order_time'] = [['egt', $cur_start], ['lt', $cur_end], 'and'];
 
                 [$start, $end] = $time_scope['add_time'];
-                $cond['vr_order.add_time'] = [['egt', $start], ['lt', $end], 'and'];
+                $cond['vr_order.add_time'] = [['egt', $start], ['elt', $end], 'and'];
             }
 
             return $cond;