From acd937ab81fb3d4a273a597f9529610fbe4e655a Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 9 Mar 2024 10:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=B1=95=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/order/StoreOrderRepository.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 3049228d..cdf74ff7 100755 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -260,14 +260,14 @@ class StoreOrderRepository extends BaseRepository $groupOrder->append(['orderList.orderProduct']); $flag = true; $profitsharing = []; - $userMerchantRepository = app()->make(UserMerchantRepository::class); - $storeOrderProfitsharingRepository = app()->make(StoreOrderProfitsharingRepository::class); + $userMerchantRepository = app()->make(UserMerchantRepository::class);//商户用户表 + $storeOrderProfitsharingRepository = app()->make(StoreOrderProfitsharingRepository::class);//分账 $uid = $groupOrder->uid; // $isVipCoupon = app()->make(StoreGroupOrderRepository::class)->isVipCoupon($groupOrder); //订单记录 - $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class); + $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);//订单操作 $svipDiscount = 0; - $financeDao = new FinancialDao(); + $financeDao = new FinancialDao(); //商户财务申请提现 foreach ($groupOrder->orderList as $_k => $order) { $isPickupCard = $order->source == 999; (new StoreActivityDao())->saveOrderProduct(2, $order); @@ -280,7 +280,7 @@ class StoreOrderRepository extends BaseRepository $presell = false; //todo 等待付尾款 if ($order->activity_type == 2) { - $_make = app()->make(ProductPresellSkuRepository::class); + $_make = app()->make(ProductPresellSkuRepository::class);//库存 if ($order->orderProduct[0]['cart_info']['productPresell']['presell_type'] == 2) { $order->status = 10; $presell = true; @@ -291,7 +291,7 @@ class StoreOrderRepository extends BaseRepository } else if ($order->activity_type == 4) { $order->status = 9; $order->save(); - $group_buying_id = app()->make(ProductGroupBuyingRepository::class)->create( + $group_buying_id = app()->make(ProductGroupBuyingRepository::class)->create( //平团 $groupOrder->user, $order->orderProduct[0]['cart_info']['activeSku']['product_group_id'], $order->orderProduct[0]['activity_id'], @@ -333,7 +333,7 @@ class StoreOrderRepository extends BaseRepository foreach ($order->orderProduct as $product) { if ($flag && $product['cart_info']['product']['is_gift_bag']) { - app()->make(UserRepository::class)->promoter($order->uid); + app()->make(UserRepository::class)->promoter($order->uid); //推广 $flag = false; } } @@ -376,7 +376,7 @@ class StoreOrderRepository extends BaseRepository if ($orderValidAmount > 0) { /** @var MerchantRepository $merchantRepo */ - $merchantRepo = app()->make(MerchantRepository::class); + $merchantRepo = app()->make(MerchantRepository::class);//商户 $merchantRepo->merId = $order['mer_id']; $merchantRepo->forceMargin = false; [$orderValidAmount, $financeDao] = $merchantRepo->deductDeposit($orderValidAmount, $order, $financeDao);