Просмотр исходного кода

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

zhangl 1 месяц назад
Родитель
Сommit
034b0eb345
2 измененных файлов с 4 добавлено и 3 удалено
  1. 2 1
      common/helpers/Tool.php
  2. 2 2
      common/libs/export/BaseExport.php

+ 2 - 1
common/helpers/Tool.php

@@ -648,7 +648,8 @@ class Tool {
 
         if ($invoiceNo) {
             // 截取后 5 位, 转为数字+1
-            $no = sprintf('%05d', intval(substr($invoiceNo, -5)) + 1);
+            $no = intval(substr($invoiceNo, -5)) + 1;
+            $no = sprintf('%05d', $no);
         } else {
             $no = '00001';
         }

+ 2 - 2
common/libs/export/BaseExport.php

@@ -1606,9 +1606,9 @@ ORDER;
             $orderTotal = 0;
             $orderTotalQuantity = count($oderList);
 
+            $no = 0;
             foreach ($oderList as $key => $value) {
-                $no = $key + 1;
-                $invoiceNo = $value['INVOICE_NO'] ?: Tool::generateInvoiceNo();
+                $no += 1;
                 $invoiceRemark = $value['INVOICE_REMARK'] ?: '';
                 $provinceName = $value['PROVINCE'] ? Region::getCnName($value['PROVINCE']) : '';
                 $cityName = $value['CITY'] ? Region::getCnName($value['CITY']) : '';