From 50d15e87ae23972ddae6ee328269f366f2a7f5e2 Mon Sep 17 00:00:00 2001
From: Terry <2358269014@qq.com>
Date: Thu, 20 Jun 2019 21:38:43 +0800
Subject: [PATCH] =?UTF-8?q?appserver=20=E5=BE=AE=E4=BF=A1h5=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Payment/controllers/Wxpayh5Controller.php | 114 ++++++++++++++++++
 .../controllers/WxpayjsapiController.php      |  15 +--
 services/helper/Appserver.php                 |   6 +
 3 files changed, 128 insertions(+), 7 deletions(-)
 create mode 100644 app/appserver/modules/Payment/controllers/Wxpayh5Controller.php

diff --git a/app/appserver/modules/Payment/controllers/Wxpayh5Controller.php b/app/appserver/modules/Payment/controllers/Wxpayh5Controller.php
new file mode 100644
index 00000000..7681b578
--- /dev/null
+++ b/app/appserver/modules/Payment/controllers/Wxpayh5Controller.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * FecShop file.
+ *
+ * @link http://www.fecshop.com/
+ * @copyright Copyright (c) 2016 FecShop Software LLC
+ * @license http://www.fecshop.com/license/
+ */
+
+namespace fecshop\app\appserver\modules\Payment\controllers;
+
+use fecshop\app\appserver\modules\Payment\PaymentController;
+use Yii;
+
+/**
+ * @author Terry Zhao <2358269014@qq.com>
+ * @since 1.0
+ */
+class Wxpayh5Controller extends PaymentController
+{
+    public $enableCsrfValidation = false;
+    protected $_increment_id;
+    protected $_order_model;
+    
+    /**
+     * 支付开始页面.
+     */
+    public function actionStart()
+    {
+        if(Yii::$app->request->getMethod() === 'OPTIONS'){
+            return [];
+        }
+        $checkOrder = $this->checkOrder();
+        if($checkOrder !== true){
+            return $checkOrder;
+        }
+        
+        $return_Url = Yii::$app->request->post('return_url');
+        //Yii::$service->page->theme->layoutFile = 'wxpay_jsapi.php';
+        $objectxml = Yii::$service->payment->wxpayH5->getScanCodeStart();
+        //var_dump($objectxml);
+        //$returnUrl =  Yii::$service->payment->getStandardReturnUrl(); 
+        $return_Url = urlencode($return_Url);
+        $redirectUrl = $objectxml['mweb_url'] . '&redirect_url=' . $return_Url;
+        $data = [
+            'redirectUrl' => $redirectUrl,
+        ];
+        $code = Yii::$service->helper->appserver->status_success;
+        $responseData = Yii::$service->helper->appserver->getResponseData($code, $data);
+        
+        return $responseData;
+        
+    }
+    
+    
+    public function actionReview()
+    {
+        if(Yii::$app->request->getMethod() === 'OPTIONS'){
+            return [];
+        }
+        $checkOrder = $this->checkOrder();
+        if($checkOrder !== true){
+            return $checkOrder;
+        }
+        
+        $out_trade_no = Yii::$service->order->getSessionIncrementId();
+        $reviewStatus = Yii::$service->payment->wxpay->scanCodeCheckTradeIsSuccess($out_trade_no);
+        if($reviewStatus){
+            $data = [
+                'redirectUrl' => $redirectUrl,
+            ];
+            $code = Yii::$service->helper->appserver->status_success;
+            $responseData = Yii::$service->helper->appserver->getResponseData($code, $data);
+            
+            return $responseData;
+        }else{
+            $errors = Yii::$service->helper->errors->get(',');
+            $data = [
+                'errors' => $errors,
+            ];
+            $code = Yii::$service->helper->appserver->order_wxpay_payment_fail;
+            $responseData = Yii::$service->helper->appserver->getResponseData($code, $data);
+            
+            return $responseData;
+        }
+    }
+    
+    /**
+     * IPN消息推送地址
+     * IPN过来后，不清除session中的 increment_id ，也不清除购物车
+     * 仅仅是更改订单支付状态。
+     */
+    public function actionIpn()
+    {
+        Yii::$service->payment->wxpay->ipn();
+    }
+    /** 废弃
+     *  成功支付页面.
+     */
+    public function actionSuccess()
+    {
+        $data = [
+            'increment_id' => $this->_increment_id,
+        ];
+        // 清理购物车中的产品。(游客用户的购物车在成功页面清空)
+        if (Yii::$app->user->isGuest) {
+            Yii::$service->cart->clearCartProductAndCoupon();
+        }
+        // 清理session中的当前的increment_id
+        Yii::$service->order->removeSessionIncrementId();
+        return $this->render('../../payment/checkmoney/success', $data);
+    }
+    
+}
diff --git a/app/appserver/modules/Payment/controllers/WxpayjsapiController.php b/app/appserver/modules/Payment/controllers/WxpayjsapiController.php
index 0e46d3db..dd3b7382 100644
--- a/app/appserver/modules/Payment/controllers/WxpayjsapiController.php
+++ b/app/appserver/modules/Payment/controllers/WxpayjsapiController.php
@@ -18,19 +18,20 @@ use Yii;
  */
 class WxpayjsapiController extends PaymentController
 {
-    
     public $enableCsrfValidation = false;
-    
-    public function init(){
-        
-    }
-    
     /**
      *  通过微信回传的code，进而获取相关的信息
      */
     public function actionStart()
     {
-        parent::init();
+        if(Yii::$app->request->getMethod() === 'OPTIONS'){
+            return [];
+        }
+        $checkOrder = $this->checkOrder();
+        if($checkOrder !== true){
+            return $checkOrder;
+        }
+        
         $code = Yii::$app->request->post('code');
         // 获取相关的code
         $data = Yii::$service->payment->wxpayJsApi->getScanCodeStart($code);
diff --git a/services/helper/Appserver.php b/services/helper/Appserver.php
index 6492e6e6..c2af5b65 100644
--- a/services/helper/Appserver.php
+++ b/services/helper/Appserver.php
@@ -170,6 +170,8 @@ class Appserver extends Service
     public $order_alipay_payment_fail                      = 1500019;           // Order: 下订单，支付宝支付订单失败
     
     public $order_payment_paypal_express_error             = 1500020;
+    
+    public $order_wxpay_payment_fail                      = 1500021;
 
     /**
      * cms
@@ -529,6 +531,10 @@ class Appserver extends Service
             $this->order_alipay_payment_fail => [
                 'message' => 'order pay by alipay payment fail',
             ],
+            $this->order_wxpay_payment_fail => [
+                'message' => 'order pay by wxpay payment fail',
+            ],
+            
             
             /**
              * cms
-- 
GitLab