diff --git a/app/common/repositories/store/order/StoreOtherOrderRepository.php b/app/common/repositories/store/order/StoreOtherOrderRepository.php index 4b68f011..21852b06 100644 --- a/app/common/repositories/store/order/StoreOtherOrderRepository.php +++ b/app/common/repositories/store/order/StoreOtherOrderRepository.php @@ -173,7 +173,11 @@ class StoreOtherOrderRepository extends BaseRepository $svipDiscount = 0; foreach ($groupOrder->orderList as $_k => $order) { 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; $groupOrder->order_extend=json_encode($order_extend,true); } @@ -327,6 +331,7 @@ class StoreOtherOrderRepository extends BaseRepository Db::commit(); return true; } catch (\Exception $e) { + halt($e->getMessage()); // 回滚事务 Db::rollback(); return false;