From 30f1b3ec612bc5d3db944cf5769566b1c2f281a3 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 5 Nov 2024 09:47:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(xlsx):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=20Excel=20=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复商品支付价格显示逻辑，当支付价格为 0 时显示总价格
- 调整门店信息显示位置，从 G 列移至 F 列
- 优化应收、应退金额的显示格式
---
 app/common/service/xlsx/OrderOutbound.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/common/service/xlsx/OrderOutbound.php b/app/common/service/xlsx/OrderOutbound.php
index 366b45d91..1db615da7 100644
--- a/app/common/service/xlsx/OrderOutbound.php
+++ b/app/common/service/xlsx/OrderOutbound.php
@@ -63,7 +63,7 @@ class OrderOutbound
             $sheet->setCellValue('D' . ($k + 4), $v['gross_weight']);
             $sheet->setCellValue('E' . ($k + 4), $v['accept_num']==0 ? $v['cart_num'] : $v['accept_num']);
             $sheet->setCellValue('F' . ($k + 4), $v['price']);
-            $sheet->setCellValue('G' . ($k + 4), $v['pay_price']);
+            $sheet->setCellValue('G' . ($k + 4), $v['pay_price']==0 ? $v['total_price'] : $v['pay_price']);
             $sheet->mergeCells('H' . ($k + 4) . ':I' . $k + 4);
             $sheet->setCellValue('H' . ($k + 4), $v['mark']);
         }
@@ -89,9 +89,9 @@ class OrderOutbound
         $sheet->setCellValue('A' . ($count + 7),'应收:');
         $sheet->setCellValue('B' . ($count + 7),$order['pay_price']==0?$order['total_price']:$order['pay_price']);
         $sheet->setCellValue('C' . ($count + 7),'应退:');
-        $sheet->setCellValue('G' . ($count + 7),'门店:');
-        $sheet->mergeCells('H' . ($count + 7) . ':I' . $count + 7);
-        $sheet->setCellValue('H' . ($count + 7),$order['system_store_name']);
+        $sheet->setCellValue('F' . ($count + 7),'门店:');
+        $sheet->mergeCells('G' . ($count + 7) . ':I' . $count + 7);
+        $sheet->setCellValue('G' . ($count + 7),$order['system_store_name']);
 
         $sheet->mergeCells('B' . ($count + 8) . ':I' . $count + 8);
         $sheet->setCellValue('A'. ($count + 8), '收货地址:');