Merge branch 'feature/purchase_record' into dev

This commit is contained in:
luofei 2023-07-11 11:59:26 +08:00
commit 11599de6fa

View File

@ -2535,12 +2535,13 @@ class StoreOrderRepository extends BaseRepository
} }
if ($type == 2) { if ($type == 2) {
$order->is_del = 1; $order->is_del = 1;
$groupOrder->is_del = 1;
} else { } else {
$order->status = StoreOrder::STATUS_WAIT_PAY; $order->status = StoreOrder::STATUS_WAIT_PAY;
$groupOrder->paid = 1;
$order->paid = 1;
} }
$groupOrder->paid = 1;
$groupOrder->save(); $groupOrder->save();
$order->paid = 1;
$order->save(); $order->save();
Db::commit(); Db::commit();
} catch (\Exception $e) { } catch (\Exception $e) {