diff --git a/app/api/controller/order/RetailOrderController.php b/app/api/controller/order/RetailOrderController.php index d92845e..8fb583a 100644 --- a/app/api/controller/order/RetailOrderController.php +++ b/app/api/controller/order/RetailOrderController.php @@ -95,18 +95,18 @@ class RetailOrderController extends BaseApiController $order = OrderLogic::createOrder($cartId, $addressId, null, $params); if ($order != false) { switch ($pay_type) { - case PayEnum::WECHAT_PAY: + case PayEnum::BALANCE_PAY: //余额支付 $user = User::where('id', $this->request->userId)->find(); $res = RetailOrderLogic::payBalance($user, $order); if (RetailOrderLogic::hasError()) { + return $this->fail(RetailOrderLogic::getError()); + } else { $res = RetailOrderLogic::paySuccess($order, ['money' => $order['actual']]); if (RetailOrderLogic::hasError()) { - } else { return $this->fail(RetailOrderLogic::getError()); } - } else { - return $this->fail(RetailOrderLogic::getError()); + return $this->success('余额支付成功'); } break; case PayEnum::WECHAT_PAY: diff --git a/config/thinkorm.php b/config/thinkorm.php index 77eb1a6..9be215f 100644 --- a/config/thinkorm.php +++ b/config/thinkorm.php @@ -23,7 +23,7 @@ return [ // 断线重连 'break_reconnect' => true, // 关闭SQL监听日志 - 'trigger_sql' => true, + 'trigger_sql' => false, // 自定义分页类 'bootstrap' => '' ],