diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index d54687e4..3372e099 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -246,6 +246,7 @@ class StoreOrderRepository extends BaseRepository public function paySuccess(StoreGroupOrder $groupOrder, $is_combine = 0, $subOrders = []) { $groupOrder->append(['user']); + //修改订单状态 Db::transaction(function () use ($subOrders, $is_combine, $groupOrder) { $time = date('Y-m-d H:i:s'); @@ -263,6 +264,19 @@ class StoreOrderRepository extends BaseRepository $isVipCoupon = $storeGroupOrderRepository->isVipCoupon($groupOrder); //验证是不是该用户的第一个订单 $groupOrder->is_first = $storeGroupOrderRepository->validateOrderIsFirst((int)$groupOrder->uid); + + //修改主表财务上传凭证 + if (isset($groupOrder->order_extend) && $groupOrder->group_order_sn) { + $res = StoreOrder::getDB()->where('order_sn',$groupOrder->group_order_sn)->find(); + if(empty($res)){ + return app('json')->fail('订单错误'); + } + $res->financial_voucher = $groupOrder->order_extend; + $res->save(); + unset($groupOrder->order_extend); + } + + //订单记录 $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class); $svipDiscount = 0; @@ -451,6 +465,9 @@ class StoreOrderRepository extends BaseRepository $groupOrder['give_coupon_ids'] = app()->make(StoreCouponRepository::class)->getGiveCoupon($groupOrder['give_coupon_ids'])->column('coupon_id'); $groupOrder->save(); }); + + + if (count($groupOrder['give_coupon_ids']) > 0) { try { Queue::push(PayGiveCouponJob::class, ['ids' => $groupOrder['give_coupon_ids'], 'uid' => $groupOrder['uid']]);