mkm/shop-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改监听事件

Browse Source
This commit is contained in:
liu 2024-03-16 14:16:33 +08:00
parent 34265487a8
commit bba2b8b2bd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/dao/store/order/StoreGroupOrderDao.php
View File

@ -86,7 +86,7 @@ class StoreGroupOrderDao extends BaseDao
*/ */
public function getTimeOutIds($time, $is_remind = false) 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) { ->when($is_remind, function ($query) {
$query->where('is_remind', 0); $query->where('is_remind', 0);
})->where('create_time', '<=', $time)->column('group_order_id'); })->where('create_time', '<=', $time)->column('group_order_id');

2
app/controller/api/store/order/StoreOrder.php
View File

@ -121,7 +121,7 @@ class StoreOrder extends BaseController
return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]); return app('json')->status('success', '支付成功', ['order_id' => $groupOrder['group_order_id']]);
} }
if ($payType == Enum::public_string) { //如果是对公转账 if ($payType == Enum::public_string) { //如果是对公转账
return app('json')->success(['order_id' => $groupOrder]); return app('json')->success(['order_id' => $groupOrder->group_order_id]);
} }
try { try {
return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp()); return $this->repository->pay($payType, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp());