kevin_zhangl před 2 roky
rodič
revize
982c9affd0

+ 2 - 2
common/config/main.php

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

+ 2 - 0
frontendApi/config/params.php

@@ -18,9 +18,11 @@ return [
         'v1/shop/verify-approach-order',
         'v1/shop/logistics',
         'v1/shop/logistics-auto',
+        'v1/shop/i-pay88'
     ],
     'noCheckPermissionActions' => [
         'shop/logistics',
         'shop/logistics-auto',
+        'shop/i-pay88'
     ],
 ];

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

@@ -417,8 +417,16 @@ class ShopController extends BaseController {
     {
         // 订单ID
         $paymentParams['RefNo'] = \Yii::$app->request->post('RefNo');
+        // 订单
+        $order = ApproachOrder::findOne(['SN' => $paymentParams['RefNo']]);
+        if (!$order) {
+            return static::notice('订单编码无效');
+        }
+        // 转为分
+        $money = $order['PAY_AMOUNT'] * 100;
+
         // 订单金额,元=>分
-        $money = \Yii::$app->request->post('Amount');
+//        $money = \Yii::$app->request->post('Amount');
         // 马来币汇率
         $exchangeRateMYR = floatval(Cache::getSystemConfig()['exchangeRateMYR']['VALUE'] ?? 0);
         // 计算马来币

+ 3 - 0
pay/return.html

@@ -0,0 +1,3 @@
+<script language="javascript">
+	location.replace("http://16.163.228.151:8015/#/shop/order-list");
+</script>