kevin_zhangl 2 лет назад
Родитель
Сommit
32ddbc6567
2 измененных файлов с 4 добавлено и 2 удалено
  1. 1 1
      common/config/main.php
  2. 3 1
      frontendApi/modules/v1/controllers/ShopController.php

+ 1 - 1
common/config/main.php

@@ -66,7 +66,7 @@ return [
             'merchantCode' => 'M08669', // 'M08669_S0002',  // M08669(prod)
             'merchantKey' => 'SiYF6a0QYy', // '5Mb154IrY8',   // SiYF6a0QYy(prod)
             'currencyCode' => 'MYR', //'CNY', // MYR(马来币) CNY(人民币)
-            'responseUrl' => 'http://nc-fele-mips.elken.com/return.html', //'https://www.ncshop2023.com/#/shop/order-list', // https://nc-fele-mips.elken.com:8015/#/shop/order-list(test)
+            'responseUrl' => 'http://nc-fele-mips.elken.com:8016/return.html', //'https://www.ncshop2023.com/#/shop/order-list', // https://nc-fele-mips.elken.com:8015/#/shop/order-list(test)
             'backendUrl' => 'http://nc-fapi-mips.elken.com:8013/pay.html', //'https://fapi.ekhkad.com/v1/shop/verify-approach-order',  // https://nc-fapi-mips.elken.com:8013/v1/shop/verify-approach-order(test)
             'requeryUrl' => 'https://payment.ipay88.com.my/epayment/enquiry.asp',
             'paymentUrl' => 'https://payment.ipay88.com.my/epayment/entry.asp',

+ 3 - 1
frontendApi/modules/v1/controllers/ShopController.php

@@ -191,7 +191,9 @@ class ShopController extends BaseController {
            //$data['list'][$key]['CITY_NAME'] = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
             //$data['list'][$key]['COUNTY_NAME'] = $value['COUNTY'] ? Region::getCnName($value['COUNTY']) : '';
             $data['list'][$key]['PAY_AT'] = Date::convert($value['PAY_AT'],'Y-m-d H:i:s');
-            $data['list'][$key]['PAY_TYPE'] = $value['PAY_TYPE'] == 'cash' ? '消费点数' : ($value['PAY_TYPE'] == 'exchange' ? '兑换点数' : '复消点数');
+//            $data['list'][$key]['PAY_TYPE'] = $value['PAY_TYPE'] == 'cash' ? '消费点数' : ($value['PAY_TYPE'] == 'exchange' ? '兑换点数' : '复消点数');
+            $data['list'][$key]['PAY_TYPE'] = ShopGoods::payTypes()[$value['PAY_TYPE']]['name'] ?? '';
+            $data['list'][$key]['STATUS'] = \Yii::$app->params['orderStatus'][$value['STATUS']]['label'] ?? '';
         }
         return static::notice($data);
     }