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

更新

Browse Source
This commit is contained in:
mkm 2023-12-27 19:14:29 +08:00
parent d1f2397622
commit 7dfc4bb948
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/repositories/store/order/StoreOtherOrderRepository.php
View File

@ -173,7 +173,11 @@ class StoreOtherOrderRepository extends BaseRepository
$svipDiscount = 0; $svipDiscount = 0;
foreach ($groupOrder->orderList as $_k => $order) { foreach ($groupOrder->orderList as $_k => $order) {
if($groupOrder->order_extend){ if($groupOrder->order_extend){
$order_extend=json_decode($order->order_extend,true); if($order->order_extend){
$order_extend=$order->order_extend;
}else{
$order_extend=[];
}
$order_extend['corporate_voucher']=$groupOrder->order_extend; $order_extend['corporate_voucher']=$groupOrder->order_extend;
$groupOrder->order_extend=json_encode($order_extend,true); $groupOrder->order_extend=json_encode($order_extend,true);
} }
@ -327,6 +331,7 @@ class StoreOtherOrderRepository extends BaseRepository
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
halt($e->getMessage());
// 回滚事务 // 回滚事务
Db::rollback(); Db::rollback();
return false; return false;