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

app/common/dao/user/UserBillDao.php

@@ -193,22 +193,26 @@ class UserBillDao extends BaseDao
     }
 
     /**
-     * @param $uid
-     * @return CommonEntity
+     * @param array $billIdList
+     * @return UserBillEntity[]
      */
-    public function getUserBillEntityByBillId($uid): CommonEntity
+    public function getUserBillEntityListByBillIdList(array $billIdList): array
     {
-        $data = [];
+        $entityList = [];
         try {
-            $dataRes = UserBill::getDB()
-                ->where('id', $uid)
-                ->find();
-            if (!empty($dataRes)) {
-                $data = $dataRes->toArray();
+            $dataList = UserBill::getDB()
+                ->whereIn('bill_id', $billIdList)
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserBillEntity::newInstance($data);
+                }, $dataList);
             }
-        } catch (\Exception $e) {
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
         }
-        return UserBillEntity::newInstance($data);
+        return $entityList;
     }
 
     /**

app/common/dao/user/UserDao.php

@@ -409,25 +409,27 @@ class UserDao extends BaseDao
         return $this::getModel()::getDB()->where('test_user', '=', 1)->whereOr('is_del', '=', 1)->column('uid');
     }
 
-
     /**
-     * @param $uid
-     * @return CommonEntity
+     * @param array $uidList
+     * @return UserEntity[]
      */
-    public function getUserEntityByUid($uid): CommonEntity
+    public function getUserEntityListByUidList(array $uidList): array
     {
-        $userData = [];
+        $entityList = [];
         try {
-            $userDataRes = User::getDB()
-                ->where('uid', $uid)
+            $dataList = User::getDB()
+                ->whereIn('uid', $uidList)
                 ->where('is_del', '=', UserEnum::IS_DEL['No']['code'])
-                ->where('status', '=', UserEnum::STATUS['Normal']['code'])
-                ->find();
-            if (!empty($userDataRes)) {
-                $userData = $userDataRes->toArray();
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserEntity::newInstance($data);
+                }, $dataList);
             }
-        } catch (\Exception $e) {
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
         }
-        return UserEntity::newInstance($userData);
+        return $entityList;
     }
 }

app/common/enum/user/UserBillEnum.php

@@ -12,6 +12,16 @@ class UserBillEnum extends CommonEnum
         'INCOME' => ['code' => 1, 'name' => '获得'],
     ];
 
+    // 明细种类
+    const CATEGORY = [
+        'NowMoney' => ['code' => 'now_money', 'name' => 'now_money']
+    ];
+
+    // 明细类型  commission佣金
+    const TYPE = [
+        'Commission' => ['code' => 'commission', 'name' => '佣金']
+    ];
+
     // 状态
     const STATUS = [
         'PENDING' => ['code' => 0, 'name' => '待确定'],

app/common/repositories/store/order/StoreOrderRepository.php

@@ -11353,10 +11353,15 @@ class StoreOrderRepository extends BaseRepository
             $userBillRepository = app()->make(UserBillRepository::class);
             $userBillRepository->addUserBill(
                 $storeOrderEntity->getUid(),
-                UserBillEnum::TYPE_SHOP['Platform']['code'],
-                $storeOrderEntity->getOrderId(),
                 UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                UserBillEnum::PM['INCOME']['code'],
                 $yanglaojin,
+                UserBillEnum::CATEGORY['NowMoney']['code'],
+                UserBillEnum::TYPE['Commission']['code'],
+                UserBillEnum::SOURCE['ONLINE']['code'],
+                UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                UserBillEnum::TYPE_SHOP['Platform']['code'],
+                $storeOrderEntity->getOrderId(),
                 '购买精彩生活商品赠送养老金'
             );
 
@@ -11444,11 +11449,16 @@ class StoreOrderRepository extends BaseRepository
                     /** @var UserBillRepository $userBillRepository */
                     $userBillRepository = app()->make(UserBillRepository::class);
                     $userBillRepository->addUserBill(
-                        $userEntityBySpreadUid->getUid(),
-                        UserBillEnum::TYPE_SHOP['Platform']['code'],
-                        $storeOrderEntity->getOrderId(),
+                        $storeOrderEntity->getUid(),
                         UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
+                        UserBillEnum::PM['INCOME']['code'],
                         $brokeragePriceBySpreadUid,
+                        UserBillEnum::CATEGORY['NowMoney']['code'],
+                        UserBillEnum::TYPE['Commission']['code'],
+                        UserBillEnum::SOURCE['ONLINE']['code'],
+                        UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                        UserBillEnum::TYPE_SHOP['Platform']['code'],
+                        $storeOrderEntity->getOrderId(),
                         '推广精彩生活区商品赠送佣金'
                     );
 
@@ -11487,11 +11497,16 @@ class StoreOrderRepository extends BaseRepository
                         /** @var UserBillRepository $userBillRepository */
                         $userBillRepository = app()->make(UserBillRepository::class);
                         $userBillRepository->addUserBill(
-                            $userEntityBySpreadUid->getUid(),
-                            UserBillEnum::TYPE_SHOP['Platform']['code'],
-                            $storeOrderEntity->getOrderId(),
+                            $storeOrderEntity->getUid(),
                             UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                            UserBillEnum::PM['INCOME']['code'],
                             $yanglaojinBySpreadUid,
+                            UserBillEnum::CATEGORY['NowMoney']['code'],
+                            UserBillEnum::TYPE['Commission']['code'],
+                            UserBillEnum::SOURCE['ONLINE']['code'],
+                            UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                            UserBillEnum::TYPE_SHOP['Platform']['code'],
+                            $storeOrderEntity->getOrderId(),
                             '推广精彩生活区商品获得养老金'
                         );
                     }
@@ -11508,11 +11523,16 @@ class StoreOrderRepository extends BaseRepository
                     /** @var UserBillRepository $userBillRepository */
                     $userBillRepository = app()->make(UserBillRepository::class);
                     $userBillRepository->addUserBill(
-                        $userEntityByShareUid->getUid(),
-                        UserBillEnum::TYPE_SHOP['Platform']['code'],
-                        $storeOrderEntity->getOrderId(),
+                        $storeOrderEntity->getUid(),
                         UserBillEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code'],
+                        UserBillEnum::PM['INCOME']['code'],
                         $brokeragePriceByShareUid,
+                        UserBillEnum::CATEGORY['NowMoney']['code'],
+                        UserBillEnum::TYPE['Commission']['code'],
+                        UserBillEnum::SOURCE['ONLINE']['code'],
+                        UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                        UserBillEnum::TYPE_SHOP['Platform']['code'],
+                        $storeOrderEntity->getOrderId(),
                         '分享精彩生活区商品赠送佣金'
                     );
                     // 计算 复购金
@@ -11544,14 +11564,18 @@ class StoreOrderRepository extends BaseRepository
                     /** @var UserBillRepository $userBillRepository */
                     $userBillRepository = app()->make(UserBillRepository::class);
                     $userBillRepository->addUserBill(
-                        $merchantEntity->getUid(),
-                        UserBillEnum::TYPE_SHOP['Platform']['code'],
-                        $storeOrderEntity->getOrderId(),
+                        $storeOrderEntity->getUid(),
                         UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
+                        UserBillEnum::PM['INCOME']['code'],
                         $brokeragePriceByMerId,
+                        UserBillEnum::CATEGORY['NowMoney']['code'],
+                        UserBillEnum::TYPE['Commission']['code'],
+                        UserBillEnum::SOURCE['ONLINE']['code'],
+                        UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                        UserBillEnum::TYPE_SHOP['Platform']['code'],
+                        $storeOrderEntity->getOrderId(),
                         '锁客佣金（精彩生活区商品赠送）'
                     );
-
                     // 计算 复购金
                     $fugouByMerId = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Lock']['Fugou']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
                     // 添加复购金记录
@@ -11578,10 +11602,15 @@ class StoreOrderRepository extends BaseRepository
                 $userBillRepository = app()->make(UserBillRepository::class);
                 $userBillRepository->addUserBill(
                     $storeOrderEntity->getUid(),
-                    UserBillEnum::TYPE_SHOP['Platform']['code'],
-                    $storeOrderEntity->getOrderId(),
                     UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                    UserBillEnum::PM['INCOME']['code'],
                     $yanglaojin,
+                    UserBillEnum::CATEGORY['NowMoney']['code'],
+                    UserBillEnum::TYPE['Commission']['code'],
+                    UserBillEnum::SOURCE['ONLINE']['code'],
+                    UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                    UserBillEnum::TYPE_SHOP['Platform']['code'],
+                    $storeOrderEntity->getOrderId(),
                     '购买会员专区商品赠送养老金'
                 );
 
@@ -11655,11 +11684,16 @@ class StoreOrderRepository extends BaseRepository
                             /** @var UserBillRepository $userBillRepository */
                             $userBillRepository = app()->make(UserBillRepository::class);
                             $userBillRepository->addUserBill(
-                                $userEntityBySpreadUid->getUid(),
-                                UserBillEnum::TYPE_SHOP['Platform']['code'],
-                                $storeOrderEntity->getOrderId(),
+                                $storeOrderEntity->getUid(),
                                 UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
+                                UserBillEnum::PM['INCOME']['code'],
                                 $brokeragePriceBySpreadUid,
+                                UserBillEnum::CATEGORY['NowMoney']['code'],
+                                UserBillEnum::TYPE['Commission']['code'],
+                                UserBillEnum::SOURCE['ONLINE']['code'],
+                                UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                                UserBillEnum::TYPE_SHOP['Platform']['code'],
+                                $storeOrderEntity->getOrderId(),
                                 '推广会员专区商品赠送佣金'
                             );
                         }
@@ -11708,11 +11742,16 @@ class StoreOrderRepository extends BaseRepository
                             /** @var UserBillRepository $userBillRepository */
                             $userBillRepository = app()->make(UserBillRepository::class);
                             $userBillRepository->addUserBill(
-                                $userEntityBySpreadUid->getUid(),
-                                UserBillEnum::TYPE_SHOP['Platform']['code'],
-                                $storeOrderEntity->getOrderId(),
+                                $storeOrderEntity->getUid(),
                                 UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                                UserBillEnum::PM['INCOME']['code'],
                                 $yanglaojinBySpreadUid,
+                                UserBillEnum::CATEGORY['NowMoney']['code'],
+                                UserBillEnum::TYPE['Commission']['code'],
+                                UserBillEnum::SOURCE['ONLINE']['code'],
+                                UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                                UserBillEnum::TYPE_SHOP['Platform']['code'],
+                                $storeOrderEntity->getOrderId(),
                                 '推广会员专区商品获得养老金'
                             );
                         }
@@ -11778,10 +11817,15 @@ class StoreOrderRepository extends BaseRepository
             $userBillRepository = app()->make(UserBillRepository::class);
             $userBillRepository->addUserBill(
                 $storeOrderEntity->getUid(),
-                UserBillEnum::TYPE_SHOP['Platform']['code'],
-                $storeOrderEntity->getOrderId(),
                 UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                UserBillEnum::PM['INCOME']['code'],
                 $yanglaojin,
+                UserBillEnum::CATEGORY['NowMoney']['code'],
+                UserBillEnum::TYPE['Commission']['code'],
+                UserBillEnum::SOURCE['ONLINE']['code'],
+                UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                UserBillEnum::TYPE_SHOP['Platform']['code'],
+                $storeOrderEntity->getOrderId(),
                 '购买商贸区商品赠送养老金'
             );
 
@@ -11882,14 +11926,18 @@ class StoreOrderRepository extends BaseRepository
                     /** @var UserBillRepository $userBillRepository */
                     $userBillRepository = app()->make(UserBillRepository::class);
                     $userBillRepository->addUserBill(
-                        $userEntityBySpreadUid->getUid(),
-                        UserBillEnum::TYPE_SHOP['Platform']['code'],
-                        $storeOrderEntity->getOrderId(),
+                        $storeOrderEntity->getUid(),
                         UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
+                        UserBillEnum::PM['INCOME']['code'],
                         $brokeragePriceBySpreadUid,
+                        UserBillEnum::CATEGORY['NowMoney']['code'],
+                        UserBillEnum::TYPE['Commission']['code'],
+                        UserBillEnum::SOURCE['ONLINE']['code'],
+                        UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                        UserBillEnum::TYPE_SHOP['Platform']['code'],
+                        $storeOrderEntity->getOrderId(),
                         '推广商贸区商品赠送佣金'
                     );
-
                     // 初始胡 贡献值
                     $gongxianBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Spread']['Gongxian']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
                     // 赠送贡献值
@@ -11925,11 +11973,16 @@ class StoreOrderRepository extends BaseRepository
                         /** @var UserBillRepository $userBillRepository */
                         $userBillRepository = app()->make(UserBillRepository::class);
                         $userBillRepository->addUserBill(
-                            $userEntityBySpreadUid->getUid(),
-                            UserBillEnum::TYPE_SHOP['Platform']['code'],
-                            $storeOrderEntity->getOrderId(),
+                            $storeOrderEntity->getUid(),
                             UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                            UserBillEnum::PM['INCOME']['code'],
                             $yanglaojinBySpreadUid,
+                            UserBillEnum::CATEGORY['NowMoney']['code'],
+                            UserBillEnum::TYPE['Commission']['code'],
+                            UserBillEnum::SOURCE['ONLINE']['code'],
+                            UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                            UserBillEnum::TYPE_SHOP['Platform']['code'],
+                            $storeOrderEntity->getOrderId(),
                             '推广商贸区商品获得养老金'
                         );
                     }
@@ -11948,11 +12001,16 @@ class StoreOrderRepository extends BaseRepository
                     /** @var UserBillRepository $userBillRepository */
                     $userBillRepository = app()->make(UserBillRepository::class);
                     $userBillRepository->addUserBill(
-                        $merchantEntityByLock->getUid(),
-                        UserBillEnum::TYPE_SHOP['Platform']['code'],
-                        $storeOrderEntity->getOrderId(),
+                        $storeOrderEntity->getUid(),
                         UserBillEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
+                        UserBillEnum::PM['INCOME']['code'],
                         $brokeragePriceByMerId,
+                        UserBillEnum::CATEGORY['NowMoney']['code'],
+                        UserBillEnum::TYPE['Commission']['code'],
+                        UserBillEnum::SOURCE['ONLINE']['code'],
+                        UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
+                        UserBillEnum::TYPE_SHOP['Platform']['code'],
+                        $storeOrderEntity->getOrderId(),
                         '锁客佣金（精彩生活区商品赠送）'
                     );
 
@@ -12023,15 +12081,10 @@ class StoreOrderRepository extends BaseRepository
             $userBillRepository = app()->make(UserBillRepository::class);
             $userBillEntityList = $userBillRepository->getUserBillEntityListByOrderIdListAndPending(UserBillEnum::TYPE_SHOP['Platform']['code'], $existOrderIdList);
             if (!empty($userBillEntityList)) {
-                foreach ($userBillEntityList as $userBillEntity) {
-                    if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['PENSION']['code']) {
-                        // 养老金
-                        $userEntity = $userRepository->getUserEntityByUid($userBillEntity->getUid());
-
-                    } else if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
-                        // 直推奖 佣金
-                    }
-                }
+                $billIdList = array_map(function ($userBillEntity) {
+                    return $userBillEntity->getBillId();
+                }, $userBillEntityList);
+                $userBillRepository->executeByIdList($billIdList);
             }
 
 

app/common/repositories/user/UserBillRepository.php

@@ -18,6 +18,7 @@ use app\common\model\user\UserBill;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\entity\data\user\UserBillEntity;
+use app\entity\data\user\UserEntity;
 use app\utils\ArrayUtil;
 use think\db\exception\DbException;
 use think\exception\ValidateException;
@@ -382,11 +383,17 @@ class UserBillRepository extends BaseRepository
     /**
      * 添加 bill 数据
      * @param int $uid
-     * @param int $typeShop
-     * @param int $orderId
      * @param int $commissionType
+     * @param int $pm
      * @param float $number
+     * @param string $category
+     * @param string $type
+     * @param string $source
+     * @param int $orderType
+     * @param int $typeShop
+     * @param int $orderId
      * @param string $mark
+     * @param string $title
      * @return UserBillEntity
      */
     public function addUserBill(int $uid, int $commissionType, int $pm, float $number, string $category, string $type, string $source, int $orderType, int $typeShop = 0, int $orderId = 0, string $mark = '', string $title = ''): UserBillEntity
@@ -451,24 +458,24 @@ class UserBillRepository extends BaseRepository
      */
     public function getUserBillEntityByBillId(int $billId): UserBillEntity
     {
-        /** @var UserBillEntity $entity */
-        $entity = $this->dao->getUserBillEntityByBillId($billId);
-        return $entity;
+        $entityList = $this->getUserBillEntityListByBillIdList([$billId]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserBillEntity) {
+            return $entity;
+        } else {
+            /** @var UserBillEntity */
+            return UserBillEntity::newInstance();
+        }
     }
 
     /**
-     * 更新记录的状态
-     * @param int $billId
-     * @param int $status
-     * @return int
+     * 获取Bill实体集合 根据 Id集合
+     * @param array $billIdList
+     * @return UserBillEntity[]
      */
-    public function updateStatusByBillId(int $billId, int $status): int
+    public function getUserBillEntityListByBillIdList(array $billIdList): array
     {
-        try {
-            return $this->dao->update($billId, ['status' => $status]);
-        } catch (DbException $e) {
-            throw new ValidateException('更新记录状态失败');
-        }
+        return $this->dao->getUserBillEntityListByBillIdList($billIdList);
     }
 
     /**
@@ -482,47 +489,73 @@ class UserBillRepository extends BaseRepository
         return $this->dao->getUserBillEntityListByOrderIdListAndPending($typeShop, $orderIdList);
     }
 
+
     /**
-     * 将 Vr 记录设置为生效状态 并对用户的 Vr 字段进行增减
-     * @param int $id
+     * 将 账单 记录设置为生效状态 并对用户的 对应 字段进行增减
+     * @param array $idList
      * @return UserBillEntity
      */
-    public function execute(int $id): UserBillEntity
+    public function executeByIdList(array $idList): UserBillEntity
     {
-        $UserBillEntity = $this->getUserBillEntityByBillId($id);
-        if (empty($UserBillEntity->getBillId()) || empty($UserBillEntity->getUid())) {
-            throw new ValidateException('无效的账单记录');
-        }
-        if (!empty($UserBillEntity->getTakeTime())) {
-            throw new ValidateException('该账单记录已更新，请勿重复操作');
-        }
+        $userBillEntityList = $this->getUserBillEntityListByBillIdList($idList);
+        if (!empty($userBillEntityList)) {
+            $userIdList = array_map(function ($userBillEntity) {
+                return $userBillEntity->getUid();
+            }, $userBillEntityList);
+            /** @var UserEntity[] $userEntityList */
+            $userEntityList = [];
+            $userEntityMapByUid = [];
+
+            if (!empty($userIdList)) {
+                /** @var UserRepository $userRepository */
+                $userRepository = app()->make(UserRepository::class);
+                $userEntityList = $userRepository->getUserEntityListByUidList($userIdList);
+                $userEntityMapByUid = array_map(function ($userEntity) {
+
+                }, $userEntityList);
+            }
 
-        /** @var UserRepository $userRepository */
-        $userRepository = app()->make(UserRepository::class);
-        $userEntity = $userRepository->getUserEntityByUid($UserBillEntity->getUid());
-        if (empty($userEntity->getUid())) {
-            throw new ValidateException('未查询到用户信息');
-        }
-        if ($UserBillEntity->getType() == UserBill::TYPE['Consume']['code']) {
-            $surplus = bcsub($userEntity->getVr(), $UserBillEntity->getNumber(), 2);
-            if ($surplus < 0.00) {
-                throw new ValidateException('用户VR不足');
+            foreach ($userBillEntityList as $userBillEntity) {
+                if (empty($userBillEntity->getBillId()) || empty($userBillEntity->getUid())) {
+                    throw new ValidateException('无效的账单记录');
+                }
+                if (!empty($userBillEntity->getTakeTime())) {
+                    throw new ValidateException('该账单记录已更新，请勿重复操作');
+                }
+
+                $userEntity = $userRepository->getUserEntityByUid($userBillEntity->getUid());
+                if (empty($userEntity->getUid())) {
+                    throw new ValidateException('未查询到用户信息');
+                }
+                if ($userBillEntity->getType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
+                    // 直推奖
+                    $surplus = bcsub($userEntity->getVr(), $userBillEntity->getNumber(), 2);
+                    if ($surplus < 0.00) {
+                        throw new ValidateException('用户VR不足');
+                    }
+                } else {
+                    $surplus = bcadd($userEntity->getVr(), $userBillEntity->getNumber(), 2);
+                }
+
+
+                try {
+                    $userBillEntity
+                        ->setSurplus($surplus)
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                    $userRepository->update($userEntity->getUid(), ['vr' => $surplus]);
+                    $this->dao->update($userBillEntity->getId(), [
+                        'surplus' => $userBillEntity->getSurplus(),
+                        'settlement_time' => $userBillEntity->getSettlementTime()
+                    ]);
+                } catch (DbException $e) {
+
+                }
             }
-        } else {
-            $surplus = bcadd($userEntity->getVr(), $UserBillEntity->getNumber(), 2);
         }
-        try {
-            $UserBillEntity
-                ->setSurplus($surplus)
-                ->setSettlementTime(date('Y-m-d H:i:s'));
-            $userRepository->update($userEntity->getUid(), ['vr' => $surplus]);
-            $this->dao->update($UserBillEntity->getId(), [
-                'surplus' => $UserBillEntity->getSurplus(),
-                'settlement_time' => $UserBillEntity->getSettlementTime()
-            ]);
-        } catch (DbException $e) {
 
-        }
-        return $UserBillEntity;
+
+
+
+        return $userBillEntity;
     }
 }

app/common/repositories/user/UserRepository.php

@@ -4399,9 +4399,24 @@ class UserRepository extends BaseRepository
      */
     public function getUserEntityByUid(int $uid): UserEntity
     {
-        /** @var UserEntity $userEntity */
-        $userEntity = $this->dao->getUserEntityByUid($uid);
-        return $userEntity;
+        $entityList = $this->getUserEntityListByUidList([$uid]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserEntity) {
+            return $entity;
+        } else {
+            /** @var UserEntity */
+            return UserEntity::newInstance();
+        }
+    }
+
+    /**
+     * 获取用户实体集合 根据 uid集合
+     * @param array $uidList
+     * @return UserEntity[]
+     */
+    public function getUserEntityListByUidList(array $uidList): array
+    {
+        return $this->dao->getUserEntityListByUidList($uidList);
     }
 
     /**