From f27435a3f704ddc251369afda83febc2de6a25b8 Mon Sep 17 00:00:00 2001 From: Nick Zeng Date: Wed, 11 Feb 2026 10:52:18 +0800 Subject: [PATCH] update refund consumer --- backend/app/Platform/RefundConsumer.php | 91 +------------------------ 1 file changed, 2 insertions(+), 89 deletions(-) diff --git a/backend/app/Platform/RefundConsumer.php b/backend/app/Platform/RefundConsumer.php index 86fc70d..5ddb85d 100644 --- a/backend/app/Platform/RefundConsumer.php +++ b/backend/app/Platform/RefundConsumer.php @@ -14,9 +14,7 @@ use Hyperf\Amqp\Result; use Hyperf\Amqp\Producer; use PhpAmqpLib\Message\AMQPMessage; use Hyperf\DbConnection\Db; -use App\Model\Order; use App\Model\RefundItem; -use Carbon\Carbon; use Exception; use Hyperf\Context\ApplicationContext; use Throwable; @@ -131,6 +129,8 @@ class RefundConsumer extends ConsumerMessage dump("ID mapping: " . count($platform_refund_id_to_local_refund_id_map) . " refunds"); + + // @attention 没有父退款的平台,业务直接跳到此处执行 PROCESS_REFUND_ITEMS: // 3. 格式化退款子项(传入 ID 映射,使子项能获取正确的 refund_id) @@ -247,9 +247,6 @@ class RefundConsumer extends ConsumerMessage return; } - // 在 upsert 之前,批量查询订单日期并填入 $items - $items = $this->fillOrderDates($items); - dump("Upserting " . count($items) . " refund items"); RefundItem::query()->upsert( @@ -282,90 +279,6 @@ class RefundConsumer extends ConsumerMessage dump("Refund items processing completed"); } - /** - * 根据退款子项的 store_id + platform_order_id 查询订单, - * 将 order_created_date 和 order_paid_date 填入 $items 数组 - * - * 订单搜索范围:[退款 created_date - 3个月, 退款 created_date] - * - * @param array $items 退款子项数据数组 - * @return array 填充了订单日期的退款子项数组 - */ - protected function fillOrderDates(array $items): array - { - // 收集需要查询的 store_id + platform_order_id 组合及对应的 created_date - $lookups = []; - foreach ($items as $item) { - $key = $item['store_id'] . ':' . $item['platform_order_id']; - if (!isset($lookups[$key])) { - $lookups[$key] = [ - 'store_id' => $item['store_id'], - 'platform_order_id' => $item['platform_order_id'], - 'created_date' => $item['created_date'], - ]; - } - } - - if (empty($lookups)) { - return $items; - } - - // 批量查询匹配订单的日期信息 - $orderDatesMap = $this->queryOrderDates($lookups); - - dump("Matched " . count($orderDatesMap) . " orders for " . count($lookups) . " refund item lookups"); - - // 将订单日期填入 $items 中对应的退款子项 - foreach ($items as &$item) { - $key = $item['store_id'] . ':' . $item['platform_order_id']; - if (isset($orderDatesMap[$key])) { - $item['order_created_date'] = $orderDatesMap[$key]['order_created_date']; - $item['order_paid_date'] = $orderDatesMap[$key]['order_paid_date']; - } - } - unset($item); - - return $items; - } - - /** - * 根据 store_id + platform_order_id 批量查询订单的创建时间和付款时间 - * - * 订单搜索范围:[退款 created_date - 3个月, 退款 created_date] - * - * @param array $lookups [key => ['store_id', 'platform_order_id', 'created_date']] - * @return array [store_id:platform_order_id => ['order_created_date' => ..., 'order_paid_date' => ...]] - */ - protected function queryOrderDates(array $lookups): array - { - $orders = Order::query() - ->where(function ($query) use ($lookups) { - foreach ($lookups as $lookup) { - $createdDate = Carbon::parse($lookup['created_date']); - $query->orWhere(function ($q) use ($lookup, $createdDate) { - $q->where('store_id', $lookup['store_id']) - ->where('platform_order_id', $lookup['platform_order_id']) - ->whereBetween('created_date', [ - $createdDate->copy()->subMonths(3), - $createdDate, - ]); - }); - } - }) - ->get(['store_id', 'platform_order_id', 'created_date', 'paid_date']); - - $map = []; - foreach ($orders as $order) { - $key = $order->store_id . ':' . $order->platform_order_id; - $map[$key] = [ - 'order_created_date' => $order->created_date, - 'order_paid_date' => $order->paid_date, - ]; - } - - return $map; - } - protected function parseValidate(EntityParseInterface $parse): void { if (!method_exists($parse, 'hasParentRefund')) {