diff --git a/app/common/repositories/store/order/StoreOtherOrderRepository.php b/app/common/repositories/store/order/StoreOtherOrderRepository.php index 0980df66..4b68f011 100644 --- a/app/common/repositories/store/order/StoreOtherOrderRepository.php +++ b/app/common/repositories/store/order/StoreOtherOrderRepository.php @@ -172,8 +172,12 @@ class StoreOtherOrderRepository extends BaseRepository $storeOrderStatusRepository = app()->make(StoreOrderStatusOtherRepository::class); $svipDiscount = 0; foreach ($groupOrder->orderList as $_k => $order) { + if($groupOrder->order_extend){ + $order_extend=json_decode($order->order_extend,true); + $order_extend['corporate_voucher']=$groupOrder->order_extend; + $groupOrder->order_extend=json_encode($order_extend,true); + } $order->paid = 2; - $order->order_extend = $groupOrder->order_extend; $order->pay_time = $time; $svipDiscount = bcadd($order->svip_discount, $svipDiscount, 2); if (isset($subOrders[$order->order_sn])) { diff --git a/app/controller/admin/order/OrderOther.php b/app/controller/admin/order/OrderOther.php index a801bf66..6939f13a 100644 --- a/app/controller/admin/order/OrderOther.php +++ b/app/controller/admin/order/OrderOther.php @@ -181,13 +181,8 @@ class OrderOther extends BaseController if(!$images){ return app('json')->fail('请上传凭证'); } - if($groupOrder->order_extend){ - $order_extend=json_decode($groupOrder->order_extend,true); - $order_extend['corporate_voucher']=$images; - $groupOrder->order_extend=json_encode($order_extend,true); - }else{ - $groupOrder->order_extend=json_encode(['corporate_voucher'=>$images],true); - } + $groupOrder->order_extend=$images; + $res=$this->repository->paySuccess($groupOrder); if($res){ return app('json')->success('操作成功');