diff --git a/app/common/dao/store/order/StoreGroupOrderDao.php b/app/common/dao/store/order/StoreGroupOrderDao.php index 64a78113..0067225c 100644 --- a/app/common/dao/store/order/StoreGroupOrderDao.php +++ b/app/common/dao/store/order/StoreGroupOrderDao.php @@ -86,7 +86,7 @@ class StoreGroupOrderDao extends BaseDao */ public function getTimeOutIds($time, $is_remind = false) { - return StoreGroupOrder::getDB()->where('is_del', 0)->where('paid', 0) + return StoreGroupOrder::getDB()->where('is_del', 0)->where('pay_type','<>',10)->where('paid', 0) ->when($is_remind, function ($query) { $query->where('is_remind', 0); })->where('create_time', '<=', $time)->column('group_order_id'); diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index a7d8f86b..c3c1f53a 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -121,7 +121,7 @@ class StoreOrder extends BaseController return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]); } if ($payType == Enum::public_string) { //如果是对公转账 - return app('json')->success(['order_id' => $groupOrder]); + return app('json')->success(['order_id' => $groupOrder->group_order_id]); } try { return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp());