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

feat: 修改支付回调处理逻辑和订单入账规则

Browse Source
This commit is contained in:
mkm 2024-06-11 10:22:13 +08:00
parent ff53552f49
commit 71ebcb10db
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/common/logic/PayNotifyLogic.php
View File

@ -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());
// }
}
/**
@ -251,7 +251,7 @@ class PayNotifyLogic extends BaseLogic
if ($order->pay_type != 9 || $order->pay_type != 10) {
$financeLogic->in($transaction_id, $order['pay_price'], OrderEnum::USER_ORDER_PAY); //用户单入账
//商户应该获得的钱 每个商品的price-ot_price 利润
if ($order->profit !== "0.00") {
if (is_int($order->profit) &&$order->profit >0) {
//手续费
$fees = bcdiv(bcmul($order['pay_price'], '0.02', 2), 1, 2);
$financeLogic->in($transaction_id, $fees, OrderEnum::ORDER_COMMITION, $order['store_id']); //手续费入账