Procházet zdrojové kódy

优化用户下单方法-进行中

sunxbiao před 11 měsíci
rodič
revize
5d2622bada

+ 8 - 8
app/common/repositories/store/order/StoreOrderRepository.php

@@ -10996,7 +10996,7 @@ class StoreOrderRepository extends BaseRepository
10996
                     /** @var UserBillRepository $userBillRepository */
10996
                     /** @var UserBillRepository $userBillRepository */
10997
                     $userBillRepository = app()->make(UserBillRepository::class);
10997
                     $userBillRepository = app()->make(UserBillRepository::class);
10998
                     $userBillRepository->addUserBill(
10998
                     $userBillRepository->addUserBill(
10999
-                        $storeOrderEntity->getUid(),
10999
+                        $userEntityBySpreadUid->getUid(),
11000
                         UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
11000
                         UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
11001
                         UserBillEnum::PM['INCOME']['code'],
11001
                         UserBillEnum::PM['INCOME']['code'],
11002
                         $brokeragePriceBySpreadUid,
11002
                         $brokeragePriceBySpreadUid,
@@ -11044,7 +11044,7 @@ class StoreOrderRepository extends BaseRepository
11044
                         /** @var UserBillRepository $userBillRepository */
11044
                         /** @var UserBillRepository $userBillRepository */
11045
                         $userBillRepository = app()->make(UserBillRepository::class);
11045
                         $userBillRepository = app()->make(UserBillRepository::class);
11046
                         $userBillRepository->addUserBill(
11046
                         $userBillRepository->addUserBill(
11047
-                            $storeOrderEntity->getUid(),
11047
+                            $userEntityBySpreadUid->getUid(),
11048
                             UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
11048
                             UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
11049
                             UserBillEnum::PM['INCOME']['code'],
11049
                             UserBillEnum::PM['INCOME']['code'],
11050
                             $yanglaojinBySpreadUid,
11050
                             $yanglaojinBySpreadUid,
@@ -11070,7 +11070,7 @@ class StoreOrderRepository extends BaseRepository
11070
                     /** @var UserBillRepository $userBillRepository */
11070
                     /** @var UserBillRepository $userBillRepository */
11071
                     $userBillRepository = app()->make(UserBillRepository::class);
11071
                     $userBillRepository = app()->make(UserBillRepository::class);
11072
                     $userBillRepository->addUserBill(
11072
                     $userBillRepository->addUserBill(
11073
-                        $storeOrderEntity->getUid(),
11073
+                        $userEntityByShareUid->getUid(),
11074
                         UserBillEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code'],
11074
                         UserBillEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code'],
11075
                         UserBillEnum::PM['INCOME']['code'],
11075
                         UserBillEnum::PM['INCOME']['code'],
11076
                         $brokeragePriceByShareUid,
11076
                         $brokeragePriceByShareUid,
@@ -11111,7 +11111,7 @@ class StoreOrderRepository extends BaseRepository
11111
                     /** @var UserBillRepository $userBillRepository */
11111
                     /** @var UserBillRepository $userBillRepository */
11112
                     $userBillRepository = app()->make(UserBillRepository::class);
11112
                     $userBillRepository = app()->make(UserBillRepository::class);
11113
                     $userBillRepository->addUserBill(
11113
                     $userBillRepository->addUserBill(
11114
-                        $storeOrderEntity->getUid(),
11114
+                        $merchantEntity->getUid(),
11115
                         UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
11115
                         UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
11116
                         UserBillEnum::PM['INCOME']['code'],
11116
                         UserBillEnum::PM['INCOME']['code'],
11117
                         $brokeragePriceByMerId,
11117
                         $brokeragePriceByMerId,
@@ -11231,7 +11231,7 @@ class StoreOrderRepository extends BaseRepository
11231
                             /** @var UserBillRepository $userBillRepository */
11231
                             /** @var UserBillRepository $userBillRepository */
11232
                             $userBillRepository = app()->make(UserBillRepository::class);
11232
                             $userBillRepository = app()->make(UserBillRepository::class);
11233
                             $userBillRepository->addUserBill(
11233
                             $userBillRepository->addUserBill(
11234
-                                $storeOrderEntity->getUid(),
11234
+                                $userEntityBySpreadUid->getUid(),
11235
                                 UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
11235
                                 UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
11236
                                 UserBillEnum::PM['INCOME']['code'],
11236
                                 UserBillEnum::PM['INCOME']['code'],
11237
                                 $brokeragePriceBySpreadUid,
11237
                                 $brokeragePriceBySpreadUid,
@@ -11488,7 +11488,7 @@ class StoreOrderRepository extends BaseRepository
11488
                     /** @var UserBillRepository $userBillRepository */
11488
                     /** @var UserBillRepository $userBillRepository */
11489
                     $userBillRepository = app()->make(UserBillRepository::class);
11489
                     $userBillRepository = app()->make(UserBillRepository::class);
11490
                     $userBillRepository->addUserBill(
11490
                     $userBillRepository->addUserBill(
11491
-                        $storeOrderEntity->getUid(),
11491
+                        $userEntityBySpreadUid->getUid(),
11492
                         UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
11492
                         UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
11493
                         UserBillEnum::PM['INCOME']['code'],
11493
                         UserBillEnum::PM['INCOME']['code'],
11494
                         $brokeragePriceBySpreadUid,
11494
                         $brokeragePriceBySpreadUid,
@@ -11535,7 +11535,7 @@ class StoreOrderRepository extends BaseRepository
11535
                         /** @var UserBillRepository $userBillRepository */
11535
                         /** @var UserBillRepository $userBillRepository */
11536
                         $userBillRepository = app()->make(UserBillRepository::class);
11536
                         $userBillRepository = app()->make(UserBillRepository::class);
11537
                         $userBillRepository->addUserBill(
11537
                         $userBillRepository->addUserBill(
11538
-                            $storeOrderEntity->getUid(),
11538
+                            $userEntityBySpreadUid->getUid(),
11539
                             UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
11539
                             UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
11540
                             UserBillEnum::PM['INCOME']['code'],
11540
                             UserBillEnum::PM['INCOME']['code'],
11541
                             $yanglaojinBySpreadUid,
11541
                             $yanglaojinBySpreadUid,
@@ -11563,7 +11563,7 @@ class StoreOrderRepository extends BaseRepository
11563
                     /** @var UserBillRepository $userBillRepository */
11563
                     /** @var UserBillRepository $userBillRepository */
11564
                     $userBillRepository = app()->make(UserBillRepository::class);
11564
                     $userBillRepository = app()->make(UserBillRepository::class);
11565
                     $userBillRepository->addUserBill(
11565
                     $userBillRepository->addUserBill(
11566
-                        $storeOrderEntity->getUid(),
11566
+                        $merchantEntityByLock->getUid(),
11567
                         UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
11567
                         UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
11568
                         UserBillEnum::PM['INCOME']['code'],
11568
                         UserBillEnum::PM['INCOME']['code'],
11569
                         $brokeragePriceByMerId,
11569
                         $brokeragePriceByMerId,