Преглед изворни кода

feat: EK-3320: 订单增加 Invoice 下载

zhangl пре 1 месец
родитељ
комит
5bb8eac204
1 измењених фајлова са 19 додато и 11 уклоњено
  1. 19 11
      common/libs/export/BaseExport.php

+ 19 - 11
common/libs/export/BaseExport.php

@@ -1579,11 +1579,16 @@ ORDER;
             $totalAmount = 0;
             $paymentStatus = ''; // 支付状态
             $invoiceRemark = '';
+            $paymentMethod = ''; // 支付方式
+            $currency = '';
             foreach ($oderList as $key => $value) {
+                $no = $key + 1;
                 $invoiceRemark = $value['INVOICE_REMARK'] ? $value['INVOICE_REMARK'] : '';
                 $provinceName = $value['PROVINCE'] ? Region::getCnName($value['PROVINCE']) : '';
                 $cityName = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
                 $countyName = $value['COUNTY'] ? Region::getCnName($value['COUNTY']) : '';
+                $paymentMethod = $value['PAY_TYPE'] ?? '';
+                $currency = $value['CURRENCY'] ?? '';
 
                 $userId = $value['USER_NAME'];
                 $userName = $value['REAL_NAME'];
@@ -1600,19 +1605,22 @@ ORDER;
                 $totalTaxAmount += $taxAmount;
                 $taxAmount = Tool::formatAmount($taxAmount);
                 $totalAmount = Tool::formatAmount($totalAmount);
+                $totalBv = Tool::formatAmount($value['BUY_NUMS'] * $value['REAL_PV']);
+                $taxAbleAmount = Tool::formatAmount($totalAmount - $taxAmount);
+
                 // 订单详情
                 $orderDetails .= <<<EOT
                 <tr>
-                    <td style="text-align: left;">{$key}</td>
+                    <td style="text-align: left;">{$no}</td>
                     <td style="text-align: left;">{$value['SKU_CODE']}</td>
                     <td style="text-align: left;">{$value['GOODS_TITLE']}</td>
                     <td style="text-align: left;">{$value['BUY_NUMS']}</td>
                     <td style="text-align: left;">{$value['REAL_PRICE']}</td>
-                    <td style="text-align: left;">{$value['REAL_PRICE']}</td>
-                    <td style="text-align: left;">{$value['REAL_PRICE']}</td>
+                    <td style="text-align: left;">{$value['REAL_PV']}</td>
+                    <td style="text-align: left;">{$totalBv}</td>
                     <td style="text-align: left;">{$taxAmount}</td>
                     <td style="text-align: left;">{$value['TAX_RATE']}</td>
-                    <td style="text-align: left;">{$taxAmount}</td>
+                    <td style="text-align: left;">{$taxAbleAmount}</td>
                     <td style="text-align: left;">{$totalAmount}</td> 
                 </tr>
 EOT;
@@ -1743,13 +1751,13 @@ ORDER;
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">Product Code</th>
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">Quantity</th>
-                                    <th style="font-size: 14px; font-weight: bold; text-align: center;">Unit Price(AED)</th>
+                                    <th style="font-size: 14px; font-weight: bold; text-align: center;">Unit Price({$currency})</th>
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">Unit BV</th>
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">Total BV</th>
-                                    <th style="font-size: 14px; font-weight: bold; text-align: center;">Taxable Amount(AED)</th>
+                                    <th style="font-size: 14px; font-weight: bold; text-align: center;">Taxable Amount({$currency})</th>
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">VAT Rate</th>
-                                    <th style="font-size: 14px; font-weight: bold; text-align: center;">VAT Amount(AED)</th>
-                                    <th style="font-size: 14px; font-weight: bold; text-align: center;">Total(AED)</th>
+                                    <th style="font-size: 14px; font-weight: bold; text-align: center;">VAT Amount({$currency})</th>
+                                    <th style="font-size: 14px; font-weight: bold; text-align: center;">Total({$currency})</th>
                                 </tr>
                                 {$orderDetails}
                             </table>
@@ -1784,7 +1792,7 @@ ORDER;
                                 <tr>
                                     <td colspan="7" class="table-noborder"></td>
                                     <td style="text-align: left; background-color: lightgoldenrodyellow;" colspan="2" >Total Amount</td>
-                                    <td style="text-align: left; background-color: lightgoldenrodyellow;" colspan="2">AED {$orderAmount}</td>
+                                    <td style="text-align: left; background-color: lightgoldenrodyellow;" colspan="2">{$currency}{$orderAmount}</td>
                                 </tr>
                             </table>
                             
@@ -1798,12 +1806,12 @@ ORDER;
                                 <tr>
                                     <td colspan="7"></td>
                                     <td style="text-align: left;" colspan="2" >Method:</td>
-                                    <td style="text-align: left;" colspan="2">Cash</td>
+                                    <td style="text-align: left;" colspan="2">{$paymentMethod}</td>
                                 </tr>
                                 <tr>
                                     <td colspan="7"></td>
                                     <td style="text-align: left;" colspan="2" >Paid amount:</td>
-                                    <td style="text-align: left;" colspan="2">AED 1423.1</td>
+                                    <td style="text-align: left;" colspan="2">{$currency} {$orderAmount}</td>
                                 </tr>
                             </table>