From d6bd3b9e97faa71a342e145cc7a38a213ae993d6 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 11 Jun 2024 14:03:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(OrderLogic):=20=E6=9B=B4=E6=96=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=80=BB=E4=BB=B7=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php        | 2 +-
 app/queue/redis/PushPlatformPrintSend.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 1c2544ff8..71d1f3081 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -76,7 +76,7 @@ class OrderLogic extends BaseLogic
 
                 $cart_select[$k]['price'] = $find['price'];
                 $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
-                $cart_select[$k]['deduction_price'] =self::$activity_price;
+                $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额
                 if (isset($check) && $check['status'] == 1) {
                     //零售价*折扣率
                     $activity_price = bcmul($find['price'], 0.9, 2);
diff --git a/app/queue/redis/PushPlatformPrintSend.php b/app/queue/redis/PushPlatformPrintSend.php
index 13ab06bb2..3f3227728 100644
--- a/app/queue/redis/PushPlatformPrintSend.php
+++ b/app/queue/redis/PushPlatformPrintSend.php
@@ -66,7 +66,7 @@ class PushPlatformPrintSend implements Consumer
     }
     public function onConsumeFailure(\Throwable $exception, $package)
     {
-        Log::error('打印队列推送失败。order_id:'. $package['data']['order_id'].',msg:'.$exception->getMessage());
+        Log::error('打印队列推送失败。order_id:'. $package['data']['id'].',msg:'.$exception->getMessage());
         return $package;
     }
 }
\ No newline at end of file