mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复购物车状态更新逻辑，优化支付通知处理。

Browse Source
This commit is contained in:
mkm 2024-05-30 13:50:01 +08:00
parent e7585cbfd8
commit 8eb7c239a5
3 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/logic/order/OrderLogic.php
View File

@ -119,6 +119,8 @@ class OrderLogic extends BaseLogic
$goods_list[$k]['nums'] = $v['cart_num']; $goods_list[$k]['nums'] = $v['cart_num'];
} }
(new Cashierinfo())->saveAll($goods_list); (new Cashierinfo())->saveAll($goods_list);
$where = ['is_pay' => 0, 'is_fail' => 0];
Cart::whereIn('cart_id', $cartId)->where($where)->update(['is_pay'=>1]);
Db::commit(); Db::commit();
return $order; return $order;
} catch (\Exception $e) { } catch (\Exception $e) {

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

@ -76,14 +76,6 @@ class PayNotifyLogic extends BaseLogic
$order->status = 2; $order->status = 2;
$financial_type2 = OrderEnum::CASHIER_ORDER_PAY; $financial_type2 = OrderEnum::CASHIER_ORDER_PAY;
} }
if ($order['cart_id']) {
if (!is_array($order['cart_id'])) {
$cart_arr = explode(',', $order['cart_id']);
Cart::whereIn('cart_id', $cart_arr)->update(['is_pay' => 1]);
} else {
Cart::whereIn('cart_id', $order['cart_id'])->update(['is_pay' => 1]);
}
}
if ($order->pay_type != 9 || $order->pay_type != 10) { if ($order->pay_type != 9 || $order->pay_type != 10) {
//用户支出流水 //用户支出流水
$record[] = [ $record[] = [
@ -218,14 +210,6 @@ class PayNotifyLogic extends BaseLogic
$order->paid = 1; $order->paid = 1;
$order->status = 2; $order->status = 2;
$order->save(); $order->save();
if ($order['cart_id']) {
if (!is_array($order['cart_id'])) {
$cart_arr = explode(',', $order['cart_id']);
Cart::whereIn('cart_id', $cart_arr)->update(['is_pay' => 1]);
} else {
Cart::whereIn('cart_id', $order['cart_id'])->update(['is_pay' => 1]);
}
}
//商户获得流水 //商户获得流水
$record[] = [ $record[] = [
'financial_record_sn' => time(), 'financial_record_sn' => time(),
@ -271,14 +255,6 @@ class PayNotifyLogic extends BaseLogic
$order->status = 2; $order->status = 2;
$financial_type2 = OrderEnum::CASHIER_ORDER_PAY; $financial_type2 = OrderEnum::CASHIER_ORDER_PAY;
} }
if ($order['cart_id']) {
if (!is_array($order['cart_id'])) {
$cart_arr = explode(',', $order['cart_id']);
Cart::whereIn('cart_id', $cart_arr)->update(['is_pay' => 1]);
} else {
Cart::whereIn('cart_id', $order['cart_id'])->update(['is_pay' => 1]);
}
}
if ($order->pay_type != 9 || $order->pay_type != 10) { if ($order->pay_type != 9 || $order->pay_type != 10) {
//用户支出流水 //用户支出流水
$record[] = [ $record[] = [

8
app/common/logic/order/RetailOrderLogic.php
View File

@ -62,14 +62,6 @@ class RetailOrderLogic extends BaseLogic
$order->money = $CallbackData['money']; $order->money = $CallbackData['money'];
$order->paid = 1; $order->paid = 1;
$order->save(); $order->save();
if ($order['cart_id']) {
if (!is_array($order['cart_id'])) {
$cart_arr = explode(',', $order['cart_id']);
Cart::whereIn('cart_id', $cart_arr)->update(['is_pay' => 1]);
} else {
Cart::whereIn('cart_id', $order['cart_id'])->update(['is_pay' => 1]);
}
}
Log::info('支付成功'); Log::info('支付成功');
// 提交事务 // 提交事务
Db::commit(); Db::commit();