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:05:50 +08:00
parent 856c57f9bf
commit d1f2397622
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,8 +172,12 @@ class StoreOtherOrderRepository extends BaseRepository
$storeOrderStatusRepository = app()->make(StoreOrderStatusOtherRepository::class); $storeOrderStatusRepository = app()->make(StoreOrderStatusOtherRepository::class);
$svipDiscount = 0; $svipDiscount = 0;
foreach ($groupOrder->orderList as $_k => $order) { 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->paid = 2;
$order->order_extend = $groupOrder->order_extend;
$order->pay_time = $time; $order->pay_time = $time;
$svipDiscount = bcadd($order->svip_discount, $svipDiscount, 2); $svipDiscount = bcadd($order->svip_discount, $svipDiscount, 2);
if (isset($subOrders[$order->order_sn])) { if (isset($subOrders[$order->order_sn])) {

9
app/controller/admin/order/OrderOther.php
View File

@ -181,13 +181,8 @@ class OrderOther extends BaseController
if(!$images){ if(!$images){
return app('json')->fail('请上传凭证'); return app('json')->fail('请上传凭证');
} }
if($groupOrder->order_extend){ $groupOrder->order_extend=$images;
$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);
}
$res=$this->repository->paySuccess($groupOrder); $res=$this->repository->paySuccess($groupOrder);
if($res){ if($res){
return app('json')->success('操作成功'); return app('json')->success('操作成功');