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

app/common/repositories/user/UserBillRepository.php

@@ -509,15 +509,17 @@ class UserBillRepository extends BaseRepository
     public function executeByIdList(array $idList): array
     {
         $userBillEntityList = $this->getUserBillEntityListByBillIdList($idList);
-        // 删除已经生效的 记录
+        // 忽略 已经生效的 记录
         $userBillEntityList = array_filter($userBillEntityList, function($entity) {
             return $entity->getStatus() != UserBillEnum::STATUS['VALID']['code'];
         });
 
         if (!empty($userBillEntityList)) {
             $pensionUidList = [];
+            // 获取所有记录的 归属人
             $userIdList = array_map(function ($userBillEntity) use (&$pensionUidList) {
-                if ($userBillEntity->getType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
+                // 获取 养老金记录
+                if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
                     $pensionUidList[] = $userBillEntity->getUid();
                 }
                 return $userBillEntity->getUid();
@@ -531,7 +533,7 @@ class UserBillRepository extends BaseRepository
             if (!empty($userIdList)) {
                 $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
             }
-            // 获取实名认证 映射信息
+            // 获取实名认证 映射信息 (养老金记录 结算时 需要确定 所属人是否已经实名认证 如果实名认证了 需要推到养老金公证处明细表里 并修改养老金记录的推送状态)
             /** @var UserCertificationEntity[] $userCertificationEntityMapByUid */
             $userCertificationEntityMapByUid = [];
             if (!empty($pensionUidList)) {
@@ -542,8 +544,8 @@ class UserBillRepository extends BaseRepository
             /** @var GzcLogRepository $gzcLogRepository */
             $gzcLogRepository = app()->make(GzcLogRepository::class);
 
-            $updateUserDataList = [];
-            $updateUserBillDataList = [];
+            $updateUserEntityList = [];
+            $updateUserBillEntityList = [];
             foreach ($userBillEntityList as $userBillEntity) {
                 if (empty($userBillEntity->getBillId()) || empty($userBillEntity->getUid())) {
                     // throw new ValidateException('无效的账单记录');
@@ -557,63 +559,87 @@ class UserBillRepository extends BaseRepository
                 if (empty($userEntity) || empty($userEntity->getUid())) {
                     throw new ValidateException("未查询到用户信息({$userBillEntity->getBillId()})");
                 }
-                if ($userBillEntity->getType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
+
+                // 更新 用户信息
+                /** @var UserEntity $updateUserEntity */
+                $updateUserEntity = $updateUserEntityList[$userEntity->getUid()] ?? UserEntity::newInstance();
+                $updateUserEntity->setUid($userEntity->getUid());
+                // 更新 账单 记录
+                /** @var UserBillEntity $updateUserBillEntity */
+                $updateUserBillEntity = $updateUserBillEntityList[$userBillEntity->getBillId()] ?? UserBillEntity::newInstance();
+                // 更新 账单记录 状态
+                $updateUserBillEntity
+                    ->setBillId($userBillEntity->getBillId())
+                    ->setStatus(UserBillEnum::STATUS['VALID']['code']);
+
+                if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
                     // 直推奖
-                    if (!isset($updateUserDataList[$userEntity->getUid()]['brokerage_price'])) {
-                        $updateUserDataList[$userEntity->getUid()]['brokerage_price'] = $userEntity->getBrokeragePrice();
+                    if (is_null($updateUserEntity->getBrokeragePrice())) {
+                        $updateUserEntity->setBrokeragePrice($userEntity->getBrokeragePrice());
                     }
-                    // 更新用户 信息
+                    // 更新用户 佣金 信息
                     if ($userBillEntity->getPm() == UserBillEnum::PM['EXPEND']['code']) {
-                        if ($updateUserDataList[$userBillEntity->getUid()]['brokerage_price'] < $userBillEntity->getNumber()) {
+                        if ($updateUserEntity->getBrokeragePrice() < $userBillEntity->getNumber()) {
                             throw new ValidateException('用户佣金不足');
                         }
-                        $updateUserDataList[$userBillEntity->getUid()]['brokerage_price'] -= $userBillEntity->getNumber();
+                        $updateUserEntity->setBrokeragePrice(bcsub($updateUserEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2));
                     } else {
-                        $updateUserDataList[$userBillEntity->getUid()]['brokerage_price'] += $userBillEntity->getNumber();
-                    }
-                    // 更新佣金记录
-                    $updateUserBillDataList[$userBillEntity->getBillId()] = [
-                        'status' => UserBillEnum::STATUS['VALID']['code']
-                    ];
-                } else if ($userBillEntity->getType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
-                    $updateUserBillDataList[$userBillEntity->getBillId()] = [
-                        'status' => UserBillEnum::STATUS['VALID']['code']
-                    ];
-                    if ($userBillEntity->getGzc() == UserBillEnum::GZC_STATUS['']) {
-
+                        $updateUserEntity->setBrokeragePrice(bcadd($updateUserEntity->getBrokeragePrice(), $userBillEntity->getNumber(), 2));
                     }
-                    if (isset($userCertificationEntityMapByUid[$userBillEntity->getUid()])) {
-                        $userCertificationEntity = $userCertificationEntityMapByUid[$userBillEntity->getUid()];
-
-                        // 创建公证处记录
-                        $gzcLogRepository->addGzcLog(
-                            $userCertificationEntity->getUid(),
-                            $userCertificationEntity->getUserName(),
-                            $userCertificationEntity->getMobile(),
-                            $userCertificationEntity->getUserCard(),
-                            $userBillEntity->getTypeShop(),
-                            $userBillEntity->getOrderSn(),
-                            $userBillEntity->getNumber()
-                        );
-                        // 更新佣金记录
 
+                } else if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
+
+                    if ($userBillEntity->getGzc() == UserBillEnum::GZC_STATUS['NOT_ENTERED']) {
+                        if (!empty($userCertificationEntityMapByUid[$userBillEntity->getUid()])) {
+                            $userCertificationEntity = $userCertificationEntityMapByUid[$userBillEntity->getUid()];
+                            // 创建公证处记录
+                            $gzcLogRepository->addGzcLog(
+                                $userCertificationEntity->getUid(),
+                                $userCertificationEntity->getUserName(),
+                                $userCertificationEntity->getMobile(),
+                                $userCertificationEntity->getUserCard(),
+                                $userBillEntity->getTypeShop(),
+                                $userBillEntity->getOrderSn(),
+                                $userBillEntity->getNumber()
+                            );
+
+                            // 养老金
+                            if (is_null($updateUserEntity->getAnnuity())) {
+                                $updateUserEntity->setAnnuity($userEntity->getAnnuity());
+                            }
+                            $updateUserEntity->setAnnuity(bcadd($updateUserEntity->getAnnuity(), $userBillEntity->getNumber(), 2));
+
+                            // 几笔养老金
+                            if (is_null($updateUserEntity->getAnnuityNum())) {
+                                $updateUserEntity->setAnnuityNum($userEntity->getAnnuityNum());
+                            }
+                            $updateUserEntity->setAnnuityNum(bcadd($updateUserEntity->getAnnuityNum(), 1));
+
+                            // 更新佣金记录
+                            $updateUserBillEntity
+                                ->setGzc(UserBillEnum::GZC_STATUS['ENTERED']['code'])
+                                ->setIsGzc(UserBillEnum::IS_GZC['NOT_STARTED']['code']);
+                        }
                     }
                 }
-                if (!empty($updateUserDataList)) {
-                    $updateList = [];
-                    foreach ($updateUserDataList as $uid => $fields) {
-                        $updateList[] = array_merge(['uid' => $uid], $fields);
-                    }
-                    $userRepository->batchUpdateUserDataByDataList($updateList);
-                }
 
-                if (!empty($updateUserBillDataList)) {
-                    $updateList = [];
-                    foreach ($updateUserBillDataList as $billId => $fields) {
-                        $updateList[] = array_merge(['bill_id' => $billId], $fields);
-                    }
-                    $this->batchUpdateUserBillDataByDataList($updateList);
-                }
+                $updateUserEntityList[$userEntity->getUid()] = $updateUserEntity;
+                $updateUserBillEntityList[$userBillEntity->getBillId()] = $updateUserBillEntity;
+            }
+            if (!empty($updateUserEntityList)) {
+                $userRepository->batchUpdateUserDataByDataList(
+                    array_map(function (UserEntity $updateUserEntity) {
+                        return $updateUserEntity->toUnderlineArray();
+                    }, $updateUserEntityList)
+                );
+            }
+
+            if (!empty($updateUserBillEntityList)) {
+                $this->batchUpdateUserBillDataByDataList(
+                    array_map(function (UserBillEntity $updateUserBillEntity) {
+                        return $updateUserBillEntity->toUnderlineArray();
+                    }, $updateUserBillEntityList)
+                );
             }
         }