Merge branch 'bugfix/standard-price' into dev

common/helpers/Tool.php

@@ -389,6 +389,15 @@ class Tool {
         return $arr;
     }
 
+    public static function mbSignConvert($string) {
+        if (false !== mb_strpos($string, '（') || false !== mb_strpos($string, '）')) {
+            $new = str_replace('（', '(', $string);
+            return str_replace('）', ')', $new);
+        }
+
+        return $string;
+    }
+
     /**
      * 获取目录内的所有文件
      * @param $dirPath

common/libs/export/BaseExport.php

@@ -338,7 +338,7 @@ class BaseExport extends Component {
                     'SN' => $columnData['SN'],
                     'STATUS' => \Yii::$app->params['orderStatus'][$columnData['STATUS']]['label'] ?? '',
                     'SKU_CODE' => $columnData['SKU_CODE'],
-                    'GOODS_TITLE' => $columnData['GOODS_TITLE'],
+                    'GOODS_TITLE' => Tool::mbSignConvert($columnData['GOODS_TITLE']) ,
                     'BUY_NUMS' => $columnData['BUY_NUMS'],
                     'CONSIGNEE' => $columnData['CONSIGNEE'],
                     'MOBILE' => "\t{$columnData['MOBILE']}",
@@ -352,8 +352,8 @@ class BaseExport extends Component {
                     // 'WAREHOUSE' => $columnData['WAREHOUSE'],
                     'CREATED_AT' => Date('Y-m-d H:i:s', $columnData['CREATED_AT']),
                     'PAY_TYPE' => ShopGoods::payTypes()[$columnData['PAY_TYPE']]['name'] ?? ShopGoods::payTypes()['cash']['name'],
-                    'PAY_AT' => Date('Y-m-d H:i:s', $columnData['PAY_AT']),
-                    'DELIVERY_AT' => Date('Y-m-d H:i:s', $columnData['DELIVERY_AT']),
+                    'PAY_AT' => $columnData['PAY_AT'] > 0 ? Date('Y-m-d H:i:s', $columnData['PAY_AT']) : '',
+                    'DELIVERY_AT' => $columnData['DELIVERY_AT'] > 0 ? Date('Y-m-d H:i:s', $columnData['DELIVERY_AT']) : '',
                     'REAL_PRICE' => $columnData['REAL_PRICE'],
                     'REAL_PV' => $columnData['REAL_PV'],
                     'STANDARD_PRICE' => $columnData['ORDER_AMOUNT_STANDARD'],