From 87356ec1d9429a246e1dcadb31dc48439b81fb14 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 8 Jun 2022 14:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/service/OrderService.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/service/OrderService.php b/app/service/OrderService.php
index 297036273..14214be4f 100755
--- a/app/service/OrderService.php
+++ b/app/service/OrderService.php
@@ -1403,7 +1403,7 @@ class OrderService
 
                 // 扩展数据
                 $v['extension_data'] = empty($v['extension_data']) ? null : json_decode($v['extension_data'], true);
-                
+
                 // 订单详情
                 if($is_items == 1)
                 {
@@ -1549,11 +1549,14 @@ class OrderService
             // 商品处理
             $res = GoodsService::GoodsDataHandle($data, ['data_key_field'=>'goods_id']);
             $data = $res['data'];
-
             foreach($data as &$vs)
             {
-                // 总价
-                $vs['total_price'] = PriceNumberFormat($vs['buy_number']*$vs['price']);
+                // 避免订单商品价格被处理，强制使用原始内容
+                if(!empty($vs['price_container']))
+                {
+                    $vs['price'] = $vs['price_container']['price'];
+                    $vs['original_price'] = $vs['price_container']['original_price'];
+                }
 
                 // 规格
                 $vs['spec_text'] = null;