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

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	app/common/logic/PayNotifyLogic.php
This commit is contained in:
liu 2024-06-11 11:12:54 +08:00
commit 3f36c2c93c
1 changed files with 8 additions and 8 deletions

16
app/common/logic/PayNotifyLogic.php

@ -29,8 +29,8 @@ class PayNotifyLogic extends BaseLogic
public static function handle($action, $orderSn, $extra = [])
{
Db::startTrans();
try {
// Db::startTrans();
// try {
if ($action != 'cash_pay' && $action != 'balancePay') {
$payNotifyLogLogic = new PayNotifyLogLogic();
if ($action == 'refund') {
@ -40,13 +40,13 @@ class PayNotifyLogic extends BaseLogic
}
}
self::$action($orderSn, $extra);
Db::commit();
// Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
Log::error('支付回调处理失败' . $e->getMessage() . ',lien:' . $e->getLine() . ',file:' . $e->getFile());
throw new \Exception($e->getMessage());
}
// } catch (\Exception $e) {
// Db::rollback();
// Log::error('支付回调处理失败' . $e->getMessage() . ',lien:' . $e->getLine() . ',file:' . $e->getFile());
// throw new \Exception($e->getMessage());
// }
}
/**