订单导出bugfix

common/helpers/Tool.php

@@ -87,11 +87,15 @@ class Tool {
      * 计算商品税额
      * @param $amount
      * @param $taxRate
-     * @param int $buyNo
+     * @param mixed $buyNo
      * @return float
      */
-    public static function calculateTax($amount, $taxRate, int $buyNo = 1): float
+    public static function calculateTax($amount, $taxRate, $buyNo = 1): float
     {
+        if (is_null($amount) || is_null($taxRate) || is_null($buyNo)) {
+            return 0.0;
+        }
+
         $taxAmount = ($amount - $amount / (1 + $taxRate / 100)) * $buyNo;
         return floatval(self::formatPrice($taxAmount));
     }

common/libs/export/BaseExport.php

@@ -355,7 +355,7 @@ class BaseExport extends Component {
                     'REAL_PV' => $columnData['REAL_PV'],
                     'PAY_FREIGHT' => $columnData['PAY_FREIGHT'],
                     'TAX_RATE' => $columnData['TAX_RATE'],
-                    'TAX_AMOUNT' => Tool::calculateTax($columnData['REAL_PRICE'], $columnData['TAX_RATE'], $columnData['TAX_RATE']),
+                    'TAX_AMOUNT' => Tool::calculateTax($columnData['REAL_PRICE'], $columnData['TAX_RATE'], $columnData['BUY_NUMS']),
                     'EXPRESS_COMPANY' => $columnData['EXPRESS_COMPANY'],
                     'ORDER_TRACK_NO' => $columnData['ORDER_TRACK_NO'],
                     'EXPRESS_TYPE' => $columnData['EXPRESS_TYPE'] == 0 ? 'mailing ':' auto pick',