diff --git a/application/service/OrderService.php b/application/service/OrderService.php index a4bc4337ced64eb394c0baba890db60da371bd34..74872e6a166e49827c0575ccbbe500f7bec85bff 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 91cfb41916ddac5929467e5e7aea81a08d74a64c..30d19ed5b88e11775501c5c800210ceebe0e28f8 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);