|
|
@@ -38,7 +38,7 @@ class OrderController extends BaseController
|
|
|
$id = isset($get['id']) ? $get['id'] : 0;
|
|
|
$order = OrderClass::getById($id, true);
|
|
|
if (isset($order->status) == false || $order->status != 1) {
|
|
|
- //util::fail('不是待付款订单');
|
|
|
+ util::fail('不是待付款订单');
|
|
|
}
|
|
|
$cgId = $order->purchaseId ?? 0;
|
|
|
$cg = PurchaseClass::getById($cgId, true);
|
|
|
@@ -48,20 +48,14 @@ class OrderController extends BaseController
|
|
|
}
|
|
|
//付款码
|
|
|
$authCode = (string)$get['auth_code'] ?? '';
|
|
|
- $order = PurchaseClass::getByCondition(['orderSn' => $orderSn], true);
|
|
|
- if (empty($order)) {
|
|
|
- util::fail('订单号无效');
|
|
|
- }
|
|
|
- $order->changePrice = 2;
|
|
|
- $order->save();
|
|
|
|
|
|
- $deadline = $order->deadline;
|
|
|
+ $deadline = $cg->deadline;
|
|
|
$current = date("Y-m-d H:i:s");
|
|
|
if ((strtotime($deadline) + 20) < strtotime($current)) {
|
|
|
util::fail('订单已经失效');
|
|
|
}
|
|
|
|
|
|
- $totalFee = $order->actPrice ?? 0;
|
|
|
+ $totalFee = $cg->actPrice ?? 0;
|
|
|
|
|
|
$aliF2F = Yii::getAlias("@vendor/alipayF2F");
|
|
|
require_once($aliF2F . '/f2fpay/model/builder/AlipayTradePayContentBuilder.php');
|
|
|
@@ -92,7 +86,6 @@ class OrderController extends BaseController
|
|
|
'QueryDuration' => "3"
|
|
|
);
|
|
|
|
|
|
-
|
|
|
$outTradeNo = $orderSn;
|
|
|
|
|
|
$subject = '购买商品';
|
|
|
@@ -118,23 +111,28 @@ class OrderController extends BaseController
|
|
|
|
|
|
switch ($barPayResult->getTradeStatus()) {
|
|
|
case "SUCCESS":
|
|
|
- echo "支付宝支付成功:" . "<br>--------------------------<br>";
|
|
|
- print_r($barPayResult->getResponse());
|
|
|
+// if (!empty($barPayResult->getResponse())) {
|
|
|
+// print_r($barPayResult->getResponse());
|
|
|
+// }
|
|
|
+ util::complete('ok');
|
|
|
break;
|
|
|
case "FAILED":
|
|
|
- echo "支付宝支付失败!!!" . "<br>--------------------------<br>";
|
|
|
- if (!empty($barPayResult->getResponse())) {
|
|
|
- print_r($barPayResult->getResponse());
|
|
|
- }
|
|
|
+// if (!empty($barPayResult->getResponse())) {
|
|
|
+// print_r($barPayResult->getResponse());
|
|
|
+// }
|
|
|
+ util::fail('支付失败,请查看订单详情');
|
|
|
break;
|
|
|
case "UNKNOWN":
|
|
|
- echo "系统异常,订单状态未知!!!" . "<br>--------------------------<br>";
|
|
|
- if (!empty($barPayResult->getResponse())) {
|
|
|
- print_r($barPayResult->getResponse());
|
|
|
- }
|
|
|
+// if (!empty($barPayResult->getResponse())) {
|
|
|
+// print_r($barPayResult->getResponse());
|
|
|
+// }
|
|
|
+ util::fail('支付异常');
|
|
|
break;
|
|
|
default:
|
|
|
- echo "不支持的交易状态,交易返回异常!!!";
|
|
|
+// if (!empty($barPayResult->getResponse())) {
|
|
|
+// print_r($barPayResult->getResponse());
|
|
|
+// }
|
|
|
+ util::fail('支付异常');
|
|
|
break;
|
|
|
}
|
|
|
}
|