Merge branch 'main' of https://code.tiantongsl.com/senyao/travel
This commit is contained in:
commit
ab3df41fe5
|
@ -339,9 +339,6 @@ class SpiderDy extends Command
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 待使用订单提醒
|
|
||||||
$reminder_orders = [];
|
|
||||||
|
|
||||||
foreach ($list as $order) {
|
foreach ($list as $order) {
|
||||||
|
|
||||||
$item = Orders::where('os', $order->os)->where('sn', $order->sn)->find();
|
$item = Orders::where('os', $order->os)->where('sn', $order->sn)->find();
|
||||||
|
@ -366,10 +363,7 @@ class SpiderDy extends Command
|
||||||
if (($order->os == 1 && array_key_exists($order->order_status, [1 => 1, 3 => 3])) ||
|
if (($order->os == 1 && array_key_exists($order->order_status, [1 => 1, 3 => 3])) ||
|
||||||
($order->os == 2 && array_key_exists($order->order_status, [2 => 2, 3 => 3, 4 => 4])) ||
|
($order->os == 2 && array_key_exists($order->order_status, [2 => 2, 3 => 3, 4 => 4])) ||
|
||||||
($order->os == 3 && $order->order_status == 1)) {
|
($order->os == 3 && $order->order_status == 1)) {
|
||||||
// $this->sms($admin_id, $order);
|
// $this->sms($admin_id, $order);
|
||||||
|
|
||||||
// 待使用订单提醒
|
|
||||||
$reminder_orders[] = $order;
|
|
||||||
}
|
}
|
||||||
//新获得一个用户的,提示管理员有新的订单
|
//新获得一个用户的,提示管理员有新的订单
|
||||||
Redis::incrBy('CRM:USER:ONLINE:NEW:' . $admin_id, 1);
|
Redis::incrBy('CRM:USER:ONLINE:NEW:' . $admin_id, 1);
|
||||||
|
@ -390,10 +384,6 @@ class SpiderDy extends Command
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($reminder_orders)) {
|
|
||||||
ServerOrders::reminderOrders(...$reminder_orders);
|
|
||||||
}
|
|
||||||
|
|
||||||
$page++;
|
$page++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -374,9 +374,6 @@ class SpiderMt extends Command
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 待使用订单提醒
|
|
||||||
$reminder_orders = [];
|
|
||||||
|
|
||||||
foreach ($list as $order) {
|
foreach ($list as $order) {
|
||||||
|
|
||||||
$item = Orders::where('os', $order->os)->where('sn', $order->sn)->find();
|
$item = Orders::where('os', $order->os)->where('sn', $order->sn)->find();
|
||||||
|
@ -401,9 +398,6 @@ class SpiderMt extends Command
|
||||||
($order->os == 2 && array_key_exists($order->order_status, [2 => 2, 3 => 3, 4 => 4])) ||
|
($order->os == 2 && array_key_exists($order->order_status, [2 => 2, 3 => 3, 4 => 4])) ||
|
||||||
($order->os == 3 && $order->order_status == 1)) {
|
($order->os == 3 && $order->order_status == 1)) {
|
||||||
$this->sms($admin_id, $order);
|
$this->sms($admin_id, $order);
|
||||||
|
|
||||||
// 待使用订单提醒
|
|
||||||
$reminder_orders[] = $order;
|
|
||||||
}
|
}
|
||||||
//新获得一个用户的,提示管理员有新的订单
|
//新获得一个用户的,提示管理员有新的订单
|
||||||
Redis::incrBy('CRM:USER:ONLINE:NEW:' . $admin_id, 1);
|
Redis::incrBy('CRM:USER:ONLINE:NEW:' . $admin_id, 1);
|
||||||
|
@ -424,10 +418,6 @@ class SpiderMt extends Command
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($reminder_orders)) {
|
|
||||||
ServerOrders::reminderOrders(...$reminder_orders);
|
|
||||||
}
|
|
||||||
|
|
||||||
$page++;
|
$page++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue