订单结算-养老金结算，修复gzc_logs表内的linkId,使其正确关联bill表内的billId

app/common/repositories/user/UserBillRepository.php

@@ -557,11 +557,10 @@ class UserBillRepository extends BaseRepository
                 $userCertificationRepository = app()->make(UserCertificationRepository::class);
                 $userCertificationEntityMapByUid = $userCertificationRepository->getUserCertificationEntityMapByUidListApproved($pensionUidList);
             }
-            /** @var GzcLogRepository $gzcLogRepository */
-            $gzcLogRepository = app()->make(GzcLogRepository::class);
 
             $updateUserEntityList = [];
             $updateUserBillEntityList = [];
+            $gzcLogDataList = [];
             foreach ($userBillEntityList as $userBillEntity) {
                 if (empty($userBillEntity->getBillId()) || empty($userBillEntity->getUid())) {
                     // throw new ValidateException('无效的账单记录');
@@ -615,15 +614,12 @@ class UserBillRepository extends BaseRepository
                         if (!empty($userCertificationEntityMapByUid[$userBillEntity->getUid()])) {
                             $userCertificationEntity = $userCertificationEntityMapByUid[$userBillEntity->getUid()];
                             // 创建公证处记录
-                            $gzcLogRepository->addGzcLog(
-                                $userCertificationEntity->getUid(),
-                                $userCertificationEntity->getUserName(),
-                                $userCertificationEntity->getMobile(),
-                                $userCertificationEntity->getUserCard(),
-                                $userBillEntity->getTypeShop(),
-                                $userBillEntity->getLinkId(),
-                                $userBillEntity->getNumber()
-                            );
+                            $gzcLogDataList[$userBillEntity->getUid()][$userBillEntity->getLinkId()][] = [
+                                'uid' => $userCertificationEntity->getUid(),
+                                'userName' => $userCertificationEntity->getUserName(),
+                                'mobile' => $userCertificationEntity->getMobile(),
+                                'userCard' => $userCertificationEntity->getUserCard()
+                            ];
 
                             // 养老金
                             if (is_null($updateUserEntity->getAnnuity())) {
@@ -657,11 +653,33 @@ class UserBillRepository extends BaseRepository
             }
 
             if (!empty($updateUserBillEntityList)) {
-                $this->batchUpdateUserBillDataByDataList(
+                $userBillDataList = $this->batchUpdateUserBillDataByDataList(
                     array_map(function (UserBillEntity $updateUserBillEntity) {
                         return $updateUserBillEntity->toUnderlineArray();
                     }, $updateUserBillEntityList)
                 );
+                // 如果有需要写入公证处的数据
+                if (!empty($userBillDataList) && !empty($gzcLogDataList)) {
+                    /** @var GzcLogRepository $gzcLogRepository */
+                    $gzcLogRepository = app()->make(GzcLogRepository::class);
+                    foreach ($userBillDataList as $userBillData) {
+                        $userBillEntity = UserBillEntity::newInstance($userBillData);
+                        if ($userBillEntity->getCommissionType() != UserBillEnum::COMMISSION_TYPE['PENSION']['code'] || empty($gzcLogDataList[$userBillEntity->getUid()][$userBillEntity->getLinkId()])) {
+                            continue;
+                        }
+                        foreach ($gzcLogDataList[$userBillEntity->getUid()][$userBillEntity->getLinkId()] as $gzcLogData) {
+                            $gzcLogRepository->addGzcLog(
+                                $gzcLogData['uid'],
+                                $gzcLogData['userName'],
+                                $gzcLogData['mobile'],
+                                $gzcLogData['userCard'],
+                                $userBillEntity->getTypeShop(),
+                                $userBillEntity->getBillId(),
+                                $userBillEntity->getNumber()
+                            );
+                        }
+                    }
+                }
             }
         }