|
|
@@ -656,25 +656,29 @@ 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('不是待付款订单');
|
|
|
+ $msg ='不是待付款订单';
|
|
|
+ util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
OrderClass::valid($order, $this->shopId);
|
|
|
$cgId = $order->purchaseId ?? 0;
|
|
|
$cg = PurchaseClass::getById($cgId, true);
|
|
|
$orderSn = $cg->orderSn ?? '';
|
|
|
if (empty($orderSn)) {
|
|
|
- util::fail('没有找到采购单');
|
|
|
+ $msg ='没有找到采购单';
|
|
|
+ util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
//付款码
|
|
|
$authCode = (string)$get['authCode'] ?? '';
|
|
|
if (empty($authCode)) {
|
|
|
- util::fail('支付失败');
|
|
|
+ $msg ='没有付款码';
|
|
|
+ util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
|
|
|
$deadline = $cg->deadline;
|
|
|
$current = date("Y-m-d H:i:s");
|
|
|
if ((strtotime($deadline) + 20) < strtotime($current)) {
|
|
|
- util::fail('订单已经失效');
|
|
|
+ $msg ='订单已经失效';
|
|
|
+ util::success(['returnStatus' => 'FAILURE'], $msg);
|
|
|
}
|
|
|
$totalFee = $cg->actPrice ?? 0;
|
|
|
|