增加财务上传成功修改

This commit is contained in:
liu 2024-03-20 09:58:59 +08:00
parent ad48d8aba6
commit 88d4efc723

View File

@ -246,6 +246,7 @@ class StoreOrderRepository extends BaseRepository
public function paySuccess(StoreGroupOrder $groupOrder, $is_combine = 0, $subOrders = []) public function paySuccess(StoreGroupOrder $groupOrder, $is_combine = 0, $subOrders = [])
{ {
$groupOrder->append(['user']); $groupOrder->append(['user']);
//修改订单状态 //修改订单状态
Db::transaction(function () use ($subOrders, $is_combine, $groupOrder) { Db::transaction(function () use ($subOrders, $is_combine, $groupOrder) {
$time = date('Y-m-d H:i:s'); $time = date('Y-m-d H:i:s');
@ -263,6 +264,19 @@ class StoreOrderRepository extends BaseRepository
$isVipCoupon = $storeGroupOrderRepository->isVipCoupon($groupOrder); $isVipCoupon = $storeGroupOrderRepository->isVipCoupon($groupOrder);
//验证是不是该用户的第一个订单 //验证是不是该用户的第一个订单
$groupOrder->is_first = $storeGroupOrderRepository->validateOrderIsFirst((int)$groupOrder->uid); $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); $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
$svipDiscount = 0; $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['give_coupon_ids'] = app()->make(StoreCouponRepository::class)->getGiveCoupon($groupOrder['give_coupon_ids'])->column('coupon_id');
$groupOrder->save(); $groupOrder->save();
}); });
if (count($groupOrder['give_coupon_ids']) > 0) { if (count($groupOrder['give_coupon_ids']) > 0) {
try { try {
Queue::push(PayGiveCouponJob::class, ['ids' => $groupOrder['give_coupon_ids'], 'uid' => $groupOrder['uid']]); Queue::push(PayGiveCouponJob::class, ['ids' => $groupOrder['give_coupon_ids'], 'uid' => $groupOrder['uid']]);