|
|
@@ -18,6 +18,7 @@ use common\models\BaApproachOrderGoods;
|
|
|
use common\models\BaOrder;
|
|
|
use common\models\BaOrderGoods;
|
|
|
use common\models\BaUser;
|
|
|
+use common\models\Currency;
|
|
|
use common\models\Export;
|
|
|
use common\models\Order;
|
|
|
use common\models\OrderGoods;
|
|
|
@@ -1581,7 +1582,7 @@ ORDER;
|
|
|
$invoiceRemark = '';
|
|
|
$paymentMethod = ''; // 支付方式
|
|
|
$currency = '';
|
|
|
- LoggerTool::debug($oderList);
|
|
|
+
|
|
|
foreach ($oderList as $key => $value) {
|
|
|
$no = $key + 1;
|
|
|
$invoiceRemark = $value['INVOICE_REMARK'] ? $value['INVOICE_REMARK'] : '';
|
|
|
@@ -1589,7 +1590,7 @@ ORDER;
|
|
|
$cityName = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
|
|
|
$countyName = $value['COUNTY'] ? Region::getCnName($value['COUNTY']) : '';
|
|
|
$paymentMethod = $value['PAY_TYPE'] ?? '';
|
|
|
- $currency = $value['CURRENCY'] ?? '';
|
|
|
+ $currency = Currency::findOne($value['CURRENCY_ID'])['CODE'] ?? '';
|
|
|
|
|
|
$userId = $value['USER_NAME'];
|
|
|
$userName = $value['REAL_NAME'];
|
zhangl