|
@@ -13,7 +13,7 @@ class ordersendlistControl extends SystemControl
|
|
parent::__construct();
|
|
parent::__construct();
|
|
}
|
|
}
|
|
|
|
|
|
- private function time_cond($timeout_type,$card_type,$cur_time)
|
|
|
|
|
|
+ private function time_cond($timeout_type, $card_type, $cur_time, $manual_time)
|
|
{
|
|
{
|
|
$mintime_getter = function ()
|
|
$mintime_getter = function ()
|
|
{
|
|
{
|
|
@@ -91,6 +91,11 @@ class ordersendlistControl extends SystemControl
|
|
else {
|
|
else {
|
|
$time_cond = [];
|
|
$time_cond = [];
|
|
}
|
|
}
|
|
|
|
+ } else if ($manual_time && $manual_time < 24) {
|
|
|
|
+ $end_offset = intval($manual_time * 3600);
|
|
|
|
+ $start_offset = intval($end_offset + 1800);
|
|
|
|
+ $time_cond['refill_order.order_time'] = ['between', [$cur_time - $start_offset, $cur_time - $end_offset]];
|
|
|
|
+ $time_cond['vr_order.add_time'] = ['between', [$cur_time - $start_offset, $cur_time]];
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -115,13 +120,14 @@ class ordersendlistControl extends SystemControl
|
|
|
|
|
|
$timeout_type = intval($_GET['time']);
|
|
$timeout_type = intval($_GET['time']);
|
|
$card_type = $_GET['card_type'];
|
|
$card_type = $_GET['card_type'];
|
|
|
|
+ $manual_time = $_GET['manual_time'];
|
|
|
|
|
|
if (!empty($_GET['store_id'])) {
|
|
if (!empty($_GET['store_id'])) {
|
|
$base_cond['vr_order.store_id'] = $_GET['store_id'];
|
|
$base_cond['vr_order.store_id'] = $_GET['store_id'];
|
|
}
|
|
}
|
|
|
|
|
|
$cur_time = time();
|
|
$cur_time = time();
|
|
- [$time_cond,$mch_cond,$card_type] = $this->time_cond($timeout_type,$card_type,$cur_time);
|
|
|
|
|
|
+ [$time_cond, $mch_cond, $card_type] = $this->time_cond($timeout_type, $card_type, $cur_time, $manual_time);
|
|
|
|
|
|
if (!empty($_GET['mchid'])) {
|
|
if (!empty($_GET['mchid'])) {
|
|
$base_cond['refill_order.mchid'] = $_GET['mchid'];
|
|
$base_cond['refill_order.mchid'] = $_GET['mchid'];
|