senyao
/
travel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

按线路分单

This commit is contained in:
jianghanbo 2024-10-14 09:06:23 +08:00
parent 47c5de6384
commit e63eb847a6
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/app/admin/controller/OrderController.php
View File

@ -96,7 +96,7 @@ class OrderController extends base
$admin_id = Admins::where('username', $admin)->value('id'); $admin_id = Admins::where('username', $admin)->value('id');
$query->where('admin_id', $admin_id); $query->where('admin_id', $admin_id);
} }
Log::info($query->getLastSql());
$excel = $request->get('excel'); $excel = $request->get('excel');
if($excel == 1) { if($excel == 1) {
$orders = $query->select(); $orders = $query->select();

8
service/app/command/SpiderDy.php
View File

@ -366,7 +366,13 @@ class SpiderDy extends Command
if (!empty($oldMobile)) { if (!empty($oldMobile)) {
$admin_id = $oldMobile->admin_id; $admin_id = $oldMobile->admin_id;
} else { } else {
$admin_id = $this->poolUser($order->orderStatus, $order->category_desc); // $admin_id = $this->poolUser($order->orderStatus, $order->category_desc);
try {
$admin_id = \app\server\Orders::poolUser($order->orderStatus, $order->product_id);
} catch (\Exception $exception) {
Log::info(sprintf('dy create order fail:%s, order_id:%s', $exception->getMessage(), $order->sn));
continue;
}
} }
if (empty($admin_id)) return null; if (empty($admin_id)) return null;

5
service/app/command/SpiderMt.php
View File

@ -378,16 +378,15 @@ class SpiderMt extends Command
$admin_id = $oldMobile->admin_id; $admin_id = $oldMobile->admin_id;
} else { } else {
try { try {
$admin_id = $this->poolUser($order->orderStatus, $order->category_desc); // $admin_id = $this->poolUser($order->orderStatus, $order->category_desc);
$admin_id = \app\server\Orders::poolUser($order->orderStatus, $order->product_id);
} catch (\Exception $exception) { } catch (\Exception $exception) {
Log::info(sprintf('mt create order fail:%s, order_id:%s', $exception->getMessage(), $order->sn)); Log::info(sprintf('mt create order fail:%s, order_id:%s', $exception->getMessage(), $order->sn));
continue; continue;
} }
} }
if (empty($admin_id)) return null; if (empty($admin_id)) return null;
} }
$order->admin_id = $admin_id; $order->admin_id = $admin_id;
$order->give_time = time(); $order->give_time = time();

8
service/app/command/SpiderTc.php
View File

@ -226,7 +226,13 @@ class SpiderTc extends Command
if (!empty($oldMobile)) { if (!empty($oldMobile)) {
$admin_id = $oldMobile->admin_id; $admin_id = $oldMobile->admin_id;
} else { } else {
$admin_id = $this->poolUser($order->orderStatus, $order->category_desc); // $admin_id = $this->poolUser($order->orderStatus, $order->category_desc);
try {
$admin_id = \app\server\Orders::poolUser($order->orderStatus, $order->product_id);
} catch (\Exception $exception) {
Log::info(sprintf('tc create order fail:%s, order_id:%s', $exception->getMessage(), $order->sn));
continue;
}
} }
if (empty($admin_id)) return null; if (empty($admin_id)) return null;

2
service/app/server/Orders.php
View File

@ -250,7 +250,7 @@ class Orders {
* @throws \Exception * @throws \Exception
*/ */
public static function poolUser($status, $thirdProductId) { public static function poolUser($status, $thirdProductId) {
$status .= $thirdProductId; // $status .= $thirdProductId;
if (empty(self::$redisPool[$status])) { if (empty(self::$redisPool[$status])) {
self::$redisPool[$status] = Redis::hGetAll('CRM:Pool:' . $status); self::$redisPool[$status] = Redis::hGetAll('CRM:Pool:' . $status);
$users = self::users($thirdProductId); $users = self::users($thirdProductId);