跨境商品支付接入

common/models/ShopGoods.php

@@ -41,9 +41,28 @@ class ShopGoods extends \common\components\ActiveRecord
             'name' => '积分兑换'
         ],
         4 => [
-            'name' => '在线支付'
-        ]
+            'name' => 'IPay88'
+        ],
+        5 => [
+            'name' => '微信'
+        ],
+        6 => [
+            'name' => '支付宝'
+        ],
+    ];
+
+    const ONLINE_PAY = [
+        4 => [
+            'name' => 'IPay88'
+        ],
+        5 => [
+            'name' => '微信'
+        ],
+        6 => [
+            'name' => '支付宝'
+        ],
     ];
+
     const GOODS_TYPE = [
         1 =>[
             'name'=>'国内商品',
@@ -173,7 +192,13 @@ class ShopGoods extends \common\components\ActiveRecord
                 'name' => '无业绩兑换点数'
             ],
             'online' => [
-                'name' => '在线支付'
+                'name' => 'IPay88'
+            ],
+            'wechat'  => [
+                'name' => '微信',
+            ],
+            'alipay'  => [
+                'name' => '支付宝',
             ],
         ];
     }

common/models/forms/ApproachOrderForm.php

@@ -193,7 +193,7 @@ class ApproachOrderForm extends Model
      */
     public function isPayType($attribute)
     {
-        if ($this->payType != 'online'){
+        if (!in_array($this->payType, array_keys(ShopGoods::ONLINE_PAY))) {
             $this->addError('支付方式错误');
         }
 

frontendApi/config/params.php

@@ -21,7 +21,6 @@ return [
         'v1/shop/i-pay88',
         'v1/shop/re-query-payment',
         'v1/shop/upop-pre-pay',
-        'v1/shop/upop-online-pay',
         'v1/shop/upop-webhook',
     ],
     'noCheckPermissionActions' => [
@@ -30,7 +29,6 @@ return [
         'shop/i-pay88',
         'shop/re-query-payment',
         'shop/upop-pre-pay',
-        'shop/upop-online-pay',
         'shop/upop-webhook',
     ],
 ];

frontendApi/config/urlManagerRules.php

@@ -83,7 +83,6 @@ return [
             'GET,POST logistics-auto' => 'logistics-auto',
             'GET online-pay-list' => 'online-pay-list',
             'POST upop-pre-pay' => 'upop-pre-pay',
-            'POST upop-online-pay' => 'upop-online-pay',
             'GET,POST upop-webhook' => 'upop-webhook',
         ],
     ],

frontendApi/modules/v1/controllers/ShopController.php

@@ -721,7 +721,7 @@ class ShopController extends BaseController {
         // 订单ID
         $refNo = 'OS202310198286872118';
         // 银行代码
-        $bankCode = "WECHAT";
+        $bankCode = "WAPWECHAT";
 
         // 订单
         $order = ApproachOrder::findOneAsArray(['SN' => $refNo]);
@@ -748,8 +748,6 @@ class ShopController extends BaseController {
             "notify_url" => \Yii::$app->params['UPOP']['notifyUrl'], // 异步通知地址
             "client_ip" => $_SERVER['REMOTE_ADDR'] // "18.139.193.5", // 客户端IP(订单⽣成的机器IP，指⽤户浏览器端IP，不是商户服务器IP) $_SERVER['REMOTE_ADDR']
         ];
-
-//        $result = Tool::httpPost(\Yii::$app->params['unityUat']['url'], http_build_query($payload));
         // 预支付
         $result = (new PaySign())->sendEncodeData($payload, \Yii::$app->params['UPOP']['backPayUrl']);