vipnub/oil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第一次更新，完成了初版调整

Browse Source
This commit is contained in:
vipnub
2026-09-07 22:05:51 +08:00
parent b5a26a8848
commit 4d6a7e7aac
198 changed files with 6142 additions and 3856 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server-tp6/app/console/command/CallbackQueue.php
+64
View File
@@ -330,6 +330,70 @@ class CallbackQueue extends Command
// $SybOil->saveLogStore('重新加入队列：【'.$message.'】');
}
break;
case "qyt_consume":
// 企油通 7.10 运单加油明细推送（一次可能多条；企油通可能重推 -> 全流程幂等）
foreach ((array)($res['order_list'] ?? []) as $c) {
$code = $c['waybill_no_code'] ?? '';
$order = Db::name('partners_order')->where('waybill_no_code', $code)->find();
if (!$order) {
$SybOil->saveLogStore('企油通消费回调未匹配订单：' . json_encode($c, 320));
continue;
}
$payTime = !empty($c['pay_time']) ? (strtotime($c['pay_time']) ?: time()) : time();
// 落消费流水（uk_consume 去重：重复回调直接忽略）
try {
Db::name('qyt_consume')->insert([
'order_id' => $order['order_id'],
'waybill_no' => $c['waybill_no'] ?? '',
'waybill_no_code' => $code,
'order_code' => $c['order_code'] ?? '',
'station_code' => $c['station_code'] ?? '',
'station_name' => $c['station_name'] ?? '',
'oil_name' => $c['oil_name'] ?? '',
'litter' => $c['litter'] ?? '',
'oil_price' => (int)($c['oil_price'] ?? 0),
'actual_oil_price' => (int)($c['actual_oil_price'] ?? 0),
'pay_fee' => (int)($c['pay_fee'] ?? 0),
'consume_amount' => (int)($c['consume_amount'] ?? 0),
'pay_time' => $payTime,
'raw' => json_encode($c, 320),
'store_id' => $order['store_id'],
'create_time' => time(),
]);
} catch (\Exception $e) {
if (strpos($e->getMessage(), 'Duplicate') === false) {
throw $e;
}
$SybOil->saveLogStore('企油通消费回调重复，忽略流水：' . $code . '/' . ($c['order_code'] ?? ''));
}
// 条件跃迁 use_status 0 -> 1（要求已发放），仅胜出者通知下单平台
$affected = Db::name('partners_order')->where('order_id', $order['order_id'])
->where('use_status', 0)
->where('oil_status', 1)
->update([
'use_status' => 1,
'use_time' => time(),
'use_text' => '加油',
'qyt_order_code' => $c['order_code'] ?? '',
'shareNo' => $c['order_code'] ?: $order['shareNo'],
'station_name' => $c['station_name'] ?? '',
'oil_name' => $c['oil_name'] ?? '',
'litter' => $c['litter'] ?? '',
'pay_fee' => (int)($c['pay_fee'] ?? 0),
'consume_time' => $payTime,
'update_time' => time(),
]);
if ($affected) {
$queueService = new QueueService();
$queueService->push('notify_queue', json_encode([
'order_id' => $order['order_id'],
'optType' => 'add_oil',
'retry_count' => 0,
], 320));
$SybOil->saveLogStore('企油通消费回调处理成功：' . json_encode($c, 320));
}
}
break;
default:
$SybOil->saveLogStore('队列数据处理异常，未知：【'.$message.'】');
}