|
@@ -351,7 +351,7 @@ class StoreOrderController
|
|
|
switch ($payType) {
|
|
|
case PayServices::WEIXIN_PAY:
|
|
|
if ($orderInfo['paid']) return app('json')->fail('支付已支付!');
|
|
|
- if ($orderInfo['award_price'] <= $yue_pay) {
|
|
|
+ if ($orderInfo['award_price'] > 0 && $orderInfo['award_price'] <= $yue_pay) {
|
|
|
return app('json')->fail('余额支付金额不能大于报单实际支付金额!');
|
|
|
}
|
|
|
//支付金额为0
|
|
@@ -409,7 +409,7 @@ class StoreOrderController
|
|
|
} else {
|
|
|
$quitUrl = $url . '?order_id=' . $orderInfo['order_id'];
|
|
|
}
|
|
|
- if ($orderInfo['award_price'] <= $yue_pay) {
|
|
|
+ if ($orderInfo['award_price'] > 0 && $orderInfo['award_price'] <= $yue_pay) {
|
|
|
return app('json')->fail('余额支付金额不能大于报单实际支付金额!');
|
|
|
}
|
|
|
//支付金额为0
|
|
@@ -552,7 +552,7 @@ class StoreOrderController
|
|
|
$order['pay_type'] = $paytype; //重新支付选择支付方式
|
|
|
switch ($order['pay_type']) {
|
|
|
case PayServices::WEIXIN_PAY:
|
|
|
- if ($order['award_price'] <= $yue_pay) {
|
|
|
+ if ($order['award_price'] > 0 && $order['award_price'] <= $yue_pay) {
|
|
|
return app('json')->fail('余额支付金额不能大于报单实际支付金额!');
|
|
|
}
|
|
|
$jsConfig = $payServices->orderPay($order->toArray(), $from, $yue_pay);
|
|
@@ -568,7 +568,7 @@ class StoreOrderController
|
|
|
if (!$quitUrl && $from != 'routine') {
|
|
|
return app('json')->fail('请传入支付宝支付回调URL');
|
|
|
}
|
|
|
- if ($order['award_price'] <= $yue_pay) {
|
|
|
+ if ($order['award_price'] > 0 && $order['award_price'] <= $yue_pay) {
|
|
|
return app('json')->fail('余额支付金额不能大于报单实际支付金额!');
|
|
|
}
|
|
|
$isCode = $from == 'routine' || $from == 'pc';
|