From f2effc585b685b0c4a2a90c7b035684b7a78658e Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 12 Jul 2019 20:29:34 +0800
Subject: [PATCH] pay

---
 application/service/OrderService.php | 2 +-
 extend/payment/MafubaoWeixin.php     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/service/OrderService.php b/application/service/OrderService.php
index a4bc4337c..74872e6a1 100755
--- a/application/service/OrderService.php
+++ b/application/service/OrderService.php
@@ -358,7 +358,7 @@ class OrderService
 
         // 支付数据校验
         $pay_name = 'payment\\'.PAYMENT_TYPE;
-        $ret = (new $pay_name($payment[0]['config']))->Respond(array_merge($_GET, $_POST));
+        $ret = (new $pay_name($payment[0]['config']))->Respond($params);
         if(!isset($ret['code']) || $ret['code'] != 0)
         {
             return $ret;
diff --git a/extend/payment/MafubaoWeixin.php b/extend/payment/MafubaoWeixin.php
index 91cfb4191..30d19ed5b 100644
--- a/extend/payment/MafubaoWeixin.php
+++ b/extend/payment/MafubaoWeixin.php
@@ -205,24 +205,24 @@ class MafubaoWeixin
         {
             switch($params['status'])
             {
-                // 成功
+                // 未支付
                 case 0 :
                     $ret = DataReturn('未支付', -100);
                     break;
 
-                // 失败
+                // 成功
                 case 1 :
                    $ret = DataReturn('支付成功', 0, $this->ReturnData($params));
                    break;
 
-                // 参数有误
+                // 支付超时
                 case 2 :
                 case 3 :
                 case 6 :
                    $ret = DataReturn('支付超时', -1001);
                    break;
 
-                // 参数有误
+                // 支付成功，通知失败
                 case 4 :
                 case 5 :
                    $ret = DataReturn('支付成功，通知失败', -1002);
-- 
GitLab