From 3c91ac40779e3acc47fcd4ded4c623c833199ca1 Mon Sep 17 00:00:00 2001
From: ctexthuang <ctexthuang@qq.com>
Date: Mon, 24 Mar 2025 10:06:29 +0800
Subject: [PATCH] feat : order info

---
 app/Amqp/Consumer/Statement/ChefConsumer.php   | 6 ++++++
 app/Amqp/Consumer/Statement/DriverConsumer.php | 6 ++++++
 app/Amqp/Consumer/Statement/SiteConsumer.php   | 6 ++++++
 app/Service/Api/Order/OrderInfoService.php     | 6 +++---
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/Amqp/Consumer/Statement/ChefConsumer.php b/app/Amqp/Consumer/Statement/ChefConsumer.php
index 24720e1..800fbb1 100644
--- a/app/Amqp/Consumer/Statement/ChefConsumer.php
+++ b/app/Amqp/Consumer/Statement/ChefConsumer.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Amqp\Consumer\Statement;
 
+use Hyperf\Amqp\Message\Type;
 use Hyperf\Amqp\Result;
 use Hyperf\Amqp\Annotation\Consumer;
 use Hyperf\Amqp\Message\ConsumerMessage;
@@ -12,6 +13,11 @@ use PhpAmqpLib\Message\AMQPMessage;
 #[Consumer(exchange: 'hyperf', routingKey: 'hyperf', queue: 'hyperf', name: "ChefConsumer", nums: 1)]
 class ChefConsumer extends ConsumerMessage
 {
+
+    /**
+     * @var Type|string 消息类型
+     */
+    protected Type|string $type = Type::DIRECT;
     public function consumeMessage($data, AMQPMessage $message): Result
     {
         return Result::ACK;
diff --git a/app/Amqp/Consumer/Statement/DriverConsumer.php b/app/Amqp/Consumer/Statement/DriverConsumer.php
index facfdcb..0d85dc4 100644
--- a/app/Amqp/Consumer/Statement/DriverConsumer.php
+++ b/app/Amqp/Consumer/Statement/DriverConsumer.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Amqp\Consumer\Statement;
 
+use Hyperf\Amqp\Message\Type;
 use Hyperf\Amqp\Result;
 use Hyperf\Amqp\Annotation\Consumer;
 use Hyperf\Amqp\Message\ConsumerMessage;
@@ -12,6 +13,11 @@ use PhpAmqpLib\Message\AMQPMessage;
 #[Consumer(exchange: 'hyperf', routingKey: 'hyperf', queue: 'hyperf', name: "DriverConsumer", nums: 1)]
 class DriverConsumer extends ConsumerMessage
 {
+
+    /**
+     * @var Type|string 消息类型
+     */
+    protected Type|string $type = Type::DIRECT;
     public function consumeMessage($data, AMQPMessage $message): Result
     {
         return Result::ACK;
diff --git a/app/Amqp/Consumer/Statement/SiteConsumer.php b/app/Amqp/Consumer/Statement/SiteConsumer.php
index bea2db8..77e4251 100644
--- a/app/Amqp/Consumer/Statement/SiteConsumer.php
+++ b/app/Amqp/Consumer/Statement/SiteConsumer.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Amqp\Consumer\Statement;
 
+use Hyperf\Amqp\Message\Type;
 use Hyperf\Amqp\Result;
 use Hyperf\Amqp\Annotation\Consumer;
 use Hyperf\Amqp\Message\ConsumerMessage;
@@ -12,6 +13,11 @@ use PhpAmqpLib\Message\AMQPMessage;
 #[Consumer(exchange: 'hyperf', routingKey: 'hyperf', queue: 'hyperf', name: "SiteConsumer", nums: 1)]
 class SiteConsumer extends ConsumerMessage
 {
+
+    /**
+     * @var Type|string 消息类型
+     */
+    protected Type|string $type = Type::DIRECT;
     public function consumeMessage($data, AMQPMessage $message): Result
     {
         return Result::ACK;
diff --git a/app/Service/Api/Order/OrderInfoService.php b/app/Service/Api/Order/OrderInfoService.php
index a78c046..dbb26fc 100644
--- a/app/Service/Api/Order/OrderInfoService.php
+++ b/app/Service/Api/Order/OrderInfoService.php
@@ -135,8 +135,8 @@ class OrderInfoService extends BaseService
 
                 $skuInfo = $skuList[$item['sku_id']] ?? [];
                 $imageId = !empty($skuInfo) && !empty(explode(',',$skuInfo['image_ids'])[0]) ? explode(',',$skuInfo['image_ids'])[0] : [];
-                $skuInfo['url'] = $imageList[$imageId]['url'] ?? '';
-                $oneCopiesInfo['image_list'][] = $imageList[$imageId] ?? [];
+//                $skuInfo['url'] = $imageList[$imageId]['url'] ?? '';
+//                $oneCopiesInfo['image_list'][] = $imageList[$imageId] ?? [];
 
                 $oneCopiesInfo['sku_list'][] = [
                     'url' => $imageList[$imageId]['url'] ?? '',
@@ -144,7 +144,7 @@ class OrderInfoService extends BaseService
                     'unit_price' => $item['unit_price'],
                     'quantity' => $item['quantity'],
                     'price' => bcmul((string)$item['unit_price'], (string)$item['quantity'], 2),
-                    'chef_name' => $chefList[$spuList[$skuList[$item['sku_id']['spu_id']]['chef_id']]]['chinese_name'] ?? '',
+                    'chef_name' => $chefList[$spuList[$skuList[$item['sku_id']]['spu_id']]['chef_id']]['chinese_name'] ?? '',
                 ];
                 $oneCopiesInfo['total_price'] = bcadd((string)$oneCopiesInfo['total_price'], bcmul((string)$item['unit_price'],(string)$item['quantity'],2), 2);
                 $oneCopiesInfo['total_quantity'] += $item['quantity'];