跨境商品支付接入

common/models/forms/ApproachOrderForm.php

@@ -208,7 +208,6 @@ class ApproachOrderForm extends Model
             $this->_model->STATUS = $this->status;
             $this->_model->NOTE = json_encode($this->note);
             $this->_model->PAY_AT = time();
-//            $this->_model->PAY_AT = Date::utcToTime($this->note['TranDate']);
             if (!$this->_model->save()) {
                 throw new Exception(Form::formatErrorsForApi($this->_model->getErrors()));
             }

frontendApi/config/params.php

@@ -20,7 +20,6 @@ return [
         'v1/shop/logistics-auto',
         'v1/shop/i-pay88',
         'v1/shop/re-query-payment',
-        'v1/shop/upop-pre-pay',
         'v1/shop/upop-webhook',
     ],
     'noCheckPermissionActions' => [
@@ -28,7 +27,6 @@ return [
         'shop/logistics-auto',
         'shop/i-pay88',
         'shop/re-query-payment',
-        'shop/upop-pre-pay',
         'shop/upop-webhook',
     ],
 ];

frontendApi/config/urlManagerRules.php

@@ -82,7 +82,6 @@ return [
             'GET,POST re-query-payment' => 're-query-payment',
             'GET logistics' => 'logistics',
             'GET,POST logistics-auto' => 'logistics-auto',
-            'POST upop-pre-pay' => 'upop-pre-pay',
             'GET,POST upop-webhook' => 'upop-webhook',
         ],
     ],

frontendApi/modules/v1/controllers/ShopController.php

@@ -720,46 +720,6 @@ class ShopController extends BaseController {
         return static::notice($notify);
     }
 
-    /*
-     * 预支付-正扫(4.1).
-     */
-    public function actionUpopPrePay()
-    {
-        // 订单ID
-        $refNo = \Yii::$app->request->post('refNo');
-        // 银行代码
-        $bankCode = \Yii::$app->request->post('bankCode');
-
-        // 订单
-        $order = ApproachOrder::findOneAsArray(['SN' => $refNo]);
-        if (!$order) {
-            return static::notice('订单编号无效');
-        }
-        $orderProducts = ApproachOrderGoods::findOneAsArray(['ORDER_SN' => $refNo]);
-
-        // 支付报文
-        $payload = [
-            "version" => "2.0.0",   // 版本号.定值2.0.0
-            "trade_code" => "PAY",  // 交易代码
-            "bank_code" => $bankCode, // 银行代码
-            "agencyId" => \Yii::$app->params['UPOP']['agencyId'], // 商户号
-            "child_merchant_no" => \Yii::$app->params['UPOP']['childMerchantId'], // 子商户号
-            "terminal_no" => \Yii::$app->params['UPOP']['terminalId'], // 商户终端号
-            "order_no" => $refNo . mt_rand(0, 10000000),   // 第三方订单号
-            "amount" => number_format($order['PAY_AMOUNT'], 2),   // 交易金额(元) 2位小数
-            "currency_type" => "HKD",   // 交易币种 HKD(港币)
-            "sett_currency_type" => "HKD",  // 清算币种 HKD(港币)
-            "product_name" => $orderProducts['GOODS_TITLE'], // 产品名称
-            "return_url" => \Yii::$app->params['UPOP']['returnUrl'], // 同步通知地址
-            "notify_url" => \Yii::$app->params['UPOP']['notifyUrl'], // 异步通知地址
-            "client_ip" => $_SERVER['REMOTE_ADDR'] // "18.139.193.5", // 客户端IP(订单⽣成的机器IP，指⽤户浏览器端IP，不是商户服务器IP) $_SERVER['REMOTE_ADDR']
-        ];
-        // 预支付
-        $result = (new PaySign())->sendEncodeData($payload, \Yii::$app->params['UPOP']['backPayUrl']);
-
-        return static::notice($result);
-    }
-
     /**
      * UPOP支付成功的webhook.
      * @throws \Exception
@@ -796,9 +756,7 @@ class ShopController extends BaseController {
                 'status' => $orderStatus,
                 'note' => $payload,
             ];
-            LoggerTool::info(['UPOP - webhook: (load).', json_encode($load)]);
-            if ($formModel->load($load, '') && $result = $formModel->verifyPayUPOP()) {
-                LoggerTool::info(['UPOP - webhook: (load).', json_encode($result)]);
+            if ($formModel->load($load, '') && $formModel->verifyPayUPOP()) {
                 LoggerTool::debug([sprintf('UPOP - webhook: (success). orderNo: {%s}', $payload['order_no'])]);
                 echo 'success';
             } else {