|
|
@@ -221,6 +221,7 @@ class ShopController extends BaseController {
|
|
|
foreach ($data['list'] as $key => $value) {
|
|
|
$data['list'][$key]['ORDER_TYPE'] = $value['ORDER_TYPE'] == 'ZC' ? '首单' : '复消';
|
|
|
$data['list'][$key]['PAY_AT'] = $value['PAY_AT'] ? Date::convert($value['PAY_AT'],'Y-m-d H:i:s') : '';
|
|
|
+ $data['list'][$key]['CREATED_AT'] = $value['CREATED_AT'] ? Date::convert($value['CREATED_AT'],'Y-m-d H:i:s') : '';
|
|
|
$data['list'][$key]['PAY_TYPE'] = ShopGoods::payTypes()[$value['PAY_TYPE']]['name'] ?? '';
|
|
|
$data['list'][$key]['STATUS'] = \Yii::$app->params['orderStatus'][$value['STATUS']]['label'] ?? '';
|
|
|
}
|
|
|
@@ -373,8 +374,8 @@ class ShopController extends BaseController {
|
|
|
"order_no" => $order->SN, // 第三方订单号
|
|
|
// "amount" => number_format($order['PAY_AMOUNT'], 2), // 交易金额(元) 2位小数
|
|
|
"amount" => number_format('0.10', 2), // TODO: 交易金额(元) 2位小数
|
|
|
- "currency_type" => "HKD", // 交易币种 HKD(港币)
|
|
|
- "sett_currency_type" => "HKD", // 清算币种 HKD(港币)
|
|
|
+ "currency_type" => \Yii::$app->params['UPOP']['currencyType'], // 交易币种 HKD(港币)
|
|
|
+ "sett_currency_type" => \Yii::$app->params['UPOP']['currencyType'], // 清算币种 HKD(港币)
|
|
|
"product_name" => $orderProducts['GOODS_TITLE'], // 产品名称
|
|
|
"return_url" => \Yii::$app->params['UPOP']['returnUrl'], // 同步通知地址
|
|
|
"notify_url" => \Yii::$app->params['UPOP']['notifyUrl'], // 异步通知地址
|
kevin