佣金结算-代码撤回-牵连东西太多-节后再搞

app/common/repositories/user/UserBillRepository.php

@@ -549,15 +549,6 @@ class UserBillRepository extends BaseRepository
             if (!empty($userIdList)) {
                 $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
             }
-
-            // 获取所有用户是否有 共富身份
-            /** @var SharedProsperityUserRepository $sharedProsperityUserRepository */
-            $sharedProsperityUserRepository = app()->make(SharedProsperityUserRepository::class);
-            $sharedProsperityUserEntityMapUserId = [];
-            if (!empty($sharedProsperityUserIdList)) {
-                $sharedProsperityUserEntityMapUserId = $sharedProsperityUserRepository->getSharedProsperityUserEntityMapByUserIdList($userIdList);
-            }
-
             // 获取实名认证 映射信息 (养老金记录 结算时 需要确定 所属人是否已经实名认证 如果实名认证了 需要推到养老金公证处明细表里 并修改养老金记录的推送状态)
             /** @var UserCertificationEntity[] $userCertificationEntityMapByUid */
             $userCertificationEntityMapByUid = [];
@@ -569,13 +560,7 @@ class UserBillRepository extends BaseRepository
             /** @var GzcLogRepository $gzcLogRepository */
             $gzcLogRepository = app()->make(GzcLogRepository::class);
 
-            // 需要更新的 用户信息-基础信息- 会员身份信息
             $updateUserEntityList = [];
-            // 需要更新的 共富体系身份信息
-            $updateSharedProsperityUserEntityList = [];
-            // 共富区 佣金收入支出记录
-            /** @var SharedProsperityBalanceLogEntity[] $insertSharedProsperityBalanceLogEntityList */
-            $insertSharedProsperityBalanceLogEntityList = [];
             $updateUserBillEntityList = [];
             foreach ($userBillEntityList as $userBillEntity) {
                 if (empty($userBillEntity->getBillId()) || empty($userBillEntity->getUid())) {
@@ -586,16 +571,15 @@ class UserBillRepository extends BaseRepository
                     throw new ValidateException("该账单记录已更新，请勿重复操作({$userBillEntity->getBillId()})");
                 }
 
-                // 判断用户是否存在
                 $userEntity = $userEntityMapByUid[$userBillEntity->getUid()];
                 if (empty($userEntity) || empty($userEntity->getUid())) {
                     throw new ValidateException("未查询到用户信息({$userBillEntity->getBillId()})");
                 }
 
-                // 要更新的用户信息
-                $updateUserEntity = null;
-                // 要更新的 共富用户信息
-                $updateSharedProsperityUserEntity = null;
+                // 更新 用户信息
+                /** @var UserEntity $updateUserEntity */
+                $updateUserEntity = $updateUserEntityList[$userEntity->getUid()] ?? UserEntity::newInstance();
+                $updateUserEntity->setUid($userEntity->getUid());
                 // 更新 账单 记录
                 /** @var UserBillEntity $updateUserBillEntity */
                 $updateUserBillEntity = $updateUserBillEntityList[$userBillEntity->getBillId()] ?? UserBillEntity::newInstance();
@@ -604,97 +588,27 @@ class UserBillRepository extends BaseRepository
                     ->setBillId($userBillEntity->getBillId())
                     ->setStatus(UserBillEnum::STATUS['VALID']['code'])
                     ->setTakeTime(time());
-                // 直推佣金 锁客佣金 平台奖励佣金 分享佣金
+
                 if (in_array($userBillEntity->getCommissionType(), [
                     UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
                     UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
                     UserBillEnum::COMMISSION_TYPE['PLATFORM_REWARD']['code'],
                     UserBillEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code']
                 ])) {
-                    // 首先判断 是否有共富会员身份
-                    $sharedProsperityUserEntity = $sharedProsperityUserEntityMapUserId[$userBillEntity->getUid()] ?? null;
-                    // 如果拥有共富身份 并且非 会员专区 专属奖励 则发放到 共富身份中
-                    if (
-                        $userBillEntity->getMerId() != CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code']
-                        && !empty($sharedProsperityUserEntity)
-                        && $sharedProsperityUserEntity instanceof SharedProsperityUserEntity
-                        && !empty($sharedProsperityUserEntity->getId())
-                    ) {
-                        // 更新 共富用户信息
-                        /** @var SharedProsperityUserEntity $updateSharedProsperityUserEntity */
-                        $updateSharedProsperityUserEntity = $updateSharedProsperityUserEntityList[$userBillEntity->getUid()] ?? SharedProsperityUserEntity::newInstance();
-                        $updateSharedProsperityUserEntity
-                            ->setId($sharedProsperityUserEntity->getId())
-                            ->setUserId($sharedProsperityUserEntity->getUserId());
-                        // 佣金
-                        if (is_null($updateSharedProsperityUserEntity->getBalance())) {
-                            $updateSharedProsperityUserEntity->setBalance($sharedProsperityUserEntity->getBalance());
-                        }
-
-                        switch ($userBillEntity->getCommissionType()) {
-                            case UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']:
-                                $sharedProsperityBalanceLogType = SharedProsperityBalanceLogEnum::TYPE['DIRECT_REFERRAL']['code'];
-                                break;
-
-                            case UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code']:
-                                $sharedProsperityBalanceLogType = SharedProsperityBalanceLogEnum::TYPE['LOCKED_CUSTOMER']['code'];
-                                break;
-
-                            case UserBillEnum::COMMISSION_TYPE['PLATFORM_REWARD']['code']:
-                                $sharedProsperityBalanceLogType = SharedProsperityBalanceLogEnum::TYPE['PLATFORM_REWARD']['code'];
-                                break;
-
-                            case UserBillEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code']:
-                                $sharedProsperityBalanceLogType = SharedProsperityBalanceLogEnum::TYPE['SHARE_EARNINGS']['code'];
-                                break;
-
-                            default:
-                                $sharedProsperityBalanceLogType = null;
-                                break;
-                        }
-                        $sharedProsperityBalanceLogEntity = SharedProsperityBalanceLogEntity::newInstance()
-                            ->setUserId($sharedProsperityUserEntity->getUserId())
-                            ->setType($sharedProsperityBalanceLogType)
-                            ->setLevel($sharedProsperityUserEntity->getPartnerLevel())
-                            ->setNumber($userBillEntity->getNumber())
-                            ->setStatus(SharedProsperityBalanceLogEnum::STATUS['VALID']['code'])
-                        ;
-
-                        // 更新用户 佣金 信息
-                        if ($userBillEntity->getPm() == UserBillEnum::PM['EXPEND']['code']) {
-                            if ($updateSharedProsperityUserEntity->getBalance() < $userBillEntity->getNumber()) {
-                                throw new ValidateException('用户佣金不足');
-                            }
-                            $updateSharedProsperityUserEntity->setBalance(bcsub($updateSharedProsperityUserEntity->getBalance(), $userBillEntity->getNumber(), 2));
-
-                            $sharedProsperityBalanceLogEntity->setPm(SharedProsperityBalanceLogEnum::PM['EXPEND']['code']);
-                        } else {
-                            $updateSharedProsperityUserEntity->setBalance(bcadd($updateSharedProsperityUserEntity->getBalance(), $userBillEntity->getNumber(), 2));
-
-                            $sharedProsperityBalanceLogEntity->setPm(SharedProsperityBalanceLogEnum::PM['INCOME']['code']);
+                    // 直推奖
+                    if (is_null($updateUserEntity->getBrokeragePrice())) {
+                        $updateUserEntity->setBrokeragePrice($userEntity->getBrokeragePrice());
+                    }
+                    // 更新用户 佣金 信息
+                    if ($userBillEntity->getPm() == UserBillEnum::PM['EXPEND']['code']) {
+                        if ($updateUserEntity->getBrokeragePrice() < $userBillEntity->getNumber()) {
+                            throw new ValidateException('用户佣金不足');
                         }
-                        // 插入 共富区 佣金记录 变动表
-                        $insertSharedProsperityBalanceLogEntityList[] = $sharedProsperityBalanceLogEntity
-                            ->setAfter($updateSharedProsperityUserEntity->getBalance());
+                        $updateUserEntity->setBrokeragePrice(bcsub($updateUserEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2));
                     } else {
-                        // 更新 用户信息
-                        /** @var UserEntity $updateUserEntity */
-                        $updateUserEntity = $updateUserEntityList[$userEntity->getUid()] ?? UserEntity::newInstance();
-                        $updateUserEntity->setUid($userEntity->getUid());
-                        // 直推奖
-                        if (is_null($updateUserEntity->getBrokeragePrice())) {
-                            $updateUserEntity->setBrokeragePrice($userEntity->getBrokeragePrice());
-                        }
-                        // 更新用户 佣金 信息
-                        if ($userBillEntity->getPm() == UserBillEnum::PM['EXPEND']['code']) {
-                            if ($updateUserEntity->getBrokeragePrice() < $userBillEntity->getNumber()) {
-                                throw new ValidateException('用户佣金不足');
-                            }
-                            $updateUserEntity->setBrokeragePrice(bcsub($updateUserEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2));
-                        } else {
-                            $updateUserEntity->setBrokeragePrice(bcadd($updateUserEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2));
-                        }
+                        $updateUserEntity->setBrokeragePrice(bcadd($updateUserEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2));
                     }
+
                 } else if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
 
                     if ($userBillEntity->getGzc() == UserBillEnum::GZC_STATUS['NOT_ENTERED']['code']) {
@@ -710,10 +624,7 @@ class UserBillRepository extends BaseRepository
                                 $userBillEntity->getLinkId(),
                                 $userBillEntity->getNumber()
                             );
-                            // 更新 用户信息
-                            /** @var UserEntity $updateUserEntity */
-                            $updateUserEntity = $updateUserEntityList[$userEntity->getUid()] ?? UserEntity::newInstance();
-                            $updateUserEntity->setUid($userEntity->getUid());
+
                             // 养老金
                             if (is_null($updateUserEntity->getAnnuity())) {
                                 $updateUserEntity->setAnnuity($userEntity->getAnnuity());
@@ -734,12 +645,7 @@ class UserBillRepository extends BaseRepository
                     }
                 }
 
-                if (!empty($updateUserEntity)) {
-                    $updateUserEntityList[$userEntity->getUid()] = $updateUserEntity;
-                }
-                if (!empty($updateSharedProsperityUserEntity)) {
-                    $updateSharedProsperityUserEntityList[$updateSharedProsperityUserEntity->getUserId()] = $updateSharedProsperityUserEntity;
-                }
+                $updateUserEntityList[$userEntity->getUid()] = $updateUserEntity;
                 $updateUserBillEntityList[$userBillEntity->getBillId()] = $updateUserBillEntity;
             }
             if (!empty($updateUserEntityList)) {
@@ -750,21 +656,6 @@ class UserBillRepository extends BaseRepository
                 );
             }
 
-            if (!empty($updateSharedProsperityUserEntityList)) {
-                $sharedProsperityUserRepository->batchUpdateSharedProsperityUserDataByDataList(
-                    array_map(function (SharedProsperityUserEntity $updateSharedProsperityUserEntity) {
-                        return $updateSharedProsperityUserEntity->toUnderlineArray();
-                    }, $updateSharedProsperityUserEntityList)
-                );
-            }
-            if (!empty($insertSharedProsperityBalanceLogEntityList)) {
-                /** @var SharedProsperityBalanceLogDao $balanceDao */
-                $balanceDao = app()->make(SharedProsperityBalanceLogDao::class);
-                $balanceDao->insertAll(array_map(function ($insertSharedProsperityBalanceLogEntity) {
-                    return $insertSharedProsperityBalanceLogEntity->toUnderlineArray();
-                }, $insertSharedProsperityBalanceLogEntityList));
-            }
-
             if (!empty($updateUserBillEntityList)) {
                 $this->batchUpdateUserBillDataByDataList(
                     array_map(function (UserBillEntity $updateUserBillEntity) {