ソースを参照

海外商品支付修改

kevin_zhangl 2 年 前
コミット
c1615affcd

+ 3 - 1
.gitignore

@@ -18,4 +18,6 @@ Desktop.ini
 #composer.json
 
 #App
-common/config/config.php
+common/config/config.php
+common/config/config-development.php
+frontendEle/src/utils/config_production.js

+ 2 - 2
common/config/main.php

@@ -66,8 +66,8 @@ return [
             'merchantCode' => 'M08669', // 'M08669_S0002',  // M08669(prod)
             'merchantKey' => 'SiYF6a0QYy', // '5Mb154IrY8',   // SiYF6a0QYy(prod)
             'currencyCode' => 'CNY', //'CNY', // MYR(马来币) CNY(人民币)
-            'responseUrl' => 'https://nc-fele-mips.elken.com:8015/#/shop/order-list', //'https://www.ncshop2023.com/#/shop/order-list', // TODO: https://nc-fele-mips.elken.com:8015/#/shop/order-list(test)
-            'backendUrl' => 'https://nc-fapi-mips.elken.com:8013/v1/shop/verify-approach-order', //'https://fapi.ekhkad.com/v1/shop/verify-approach-order',  // https://nc-fapi-mips.elken.com:8013/v1/shop/verify-approach-order(test)
+            'responseUrl' => 'https://www.ncshop2023.com/#/shop/order-list', //'https://www.ncshop2023.com/#/shop/order-list', // TODO: https://nc-fele-mips.elken.com:8015/#/shop/order-list(test)
+            'backendUrl' => 'https://fapi.ekhkad.com/v1/shop/verify-approach-order', //'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',
             'recurringUrlSubscription' => 'https://www.ipay88.com/recurringpayment/webservice/RecurringPayment.asmx/Subscription',

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

@@ -423,7 +423,8 @@ class ShopController extends BaseController {
         $exchangeRateMYR = floatval(Cache::getSystemConfig()['exchangeRateMYR']['VALUE'] ?? 0);
         // 计算马来币
 //        $amount = number_format(round($money * $exchangeRateMYR), 2, '.', '');
-        $amount = number_format(1, 2, '.', ''); // TODO: 测试
+        $amount = number_format($money, 2, '.', '');
+//        $amount = number_format(1, 2, '.', ''); // TODO: 测试
         $paymentParams['Amount'] = str_replace('.', '', $amount);
         // (Optional) (int)
         $paymentParams['PaymentId'] = '';   // 2=信用卡 182=银联