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

app/common/dao/user/UserSignGongxianDao.php

@@ -3,12 +3,87 @@
 namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
+use app\common\enum\user\UserSignGongxianEnum;
+use app\common\model\BaseModel;
 use app\common\model\user\UserSignGongxian;
+use app\entity\CommonEntity;
+use app\entity\data\user\UserSignGongxianEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 class UserSignGongxianDao extends BaseDao
 {
+    /**
+     * @return BaseModel
+     */
     protected function getModel(): string
     {
         return UserSignGongxian::class;
     }
+
+    /**
+     * @param array $idList
+     * @return CommonEntity[]
+     */
+    public function getUserSignGongxianEntityListByIdList(array $idList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignGongxian $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->whereIn('id', $idList)
+                ->select()
+                ->toArray();
+            if (!empty($dataRes)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignGongxianEntity::newInstance($data);
+                }, $dataRes);
+            }
+        } catch (\Exception $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignGongxianEntity[]
+     */
+    public function getUserSignGongxianEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserSignGongxian::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserSignGongxianEnum::STATUS['PendingConfirmation']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignGongxianEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/dao/user/UserSignScoreDao.php

@@ -4,6 +4,7 @@ namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
 use app\common\enum\user\UserSignScoreEnum;
+use app\common\model\BaseModel;
 use app\common\model\user\UserSignScore;
 use app\entity\CommonEntity;
 use app\entity\data\user\UserSignScoreEntity;
@@ -13,6 +14,9 @@ use think\db\exception\ModelNotFoundException;
 
 class UserSignScoreDao extends BaseDao
 {
+    /**
+     * @return BaseModel
+     */
     protected function getModel(): string
     {
         return UserSignScore::class;
@@ -22,7 +26,7 @@ class UserSignScoreDao extends BaseDao
      * @param array $idList
      * @return CommonEntity[]
      */
-    public function getStoreSignScoreEntityListByIdList(array $idList): array
+    public function getUserSignScoreEntityListByIdList(array $idList): array
     {
         $entityList = [];
         try {
@@ -48,7 +52,7 @@ class UserSignScoreDao extends BaseDao
      * @param array $orderIdList
      * @return UserSignScoreEntity[]
      */
-    public function getUserBillEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    public function getUserSignScoreEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
     {
         $entityList = [];
         try {
@@ -68,4 +72,18 @@ class UserSignScoreDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

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

@@ -11767,10 +11767,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(),
                 '购买复购区赠送养老金'
             );
 
@@ -11783,10 +11788,15 @@ class StoreOrderRepository extends BaseRepository
                     $userBillRepository = app()->make(UserBillRepository::class);
                     $userBillRepository->addUserBill(
                         $userEntityBySpreadUid->getUid(),
-                        UserBillEnum::TYPE_SHOP['Platform']['code'],
-                        $storeOrderEntity->getOrderId(),
                         UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                        UserBillEnum::PM['INCOME']['code'],
                         $yanglaojinBySpreadDirectly,
+                        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(),
                         '推荐复购区商品赠送养老金'
                     );
 
@@ -11799,10 +11809,15 @@ class StoreOrderRepository extends BaseRepository
                             $userBillRepository = app()->make(UserBillRepository::class);
                             $userBillRepository->addUserBill(
                                 $userEntityByIndirectlySpreadUid->getUid(),
-                                UserBillEnum::TYPE_SHOP['Platform']['code'],
-                                $storeOrderEntity->getOrderId(),
                                 UserBillEnum::COMMISSION_TYPE['PENSION']['code'],
+                                UserBillEnum::PM['INCOME']['code'],
                                 $yanglaojinBySpreadIndirectly,
+                                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(),
                                 '间推复购区商品赠送养老金'
                             );
                         }
@@ -12079,7 +12094,7 @@ class StoreOrderRepository extends BaseRepository
                 return;
             }
 
-            /** 养老金 佣金 */
+            /** 结算 养老金 佣金 */
             /** @var UserBillRepository $userBillRepository */
             $userBillRepository = app()->make(UserBillRepository::class);
             $userBillEntityList = $userBillRepository->getUserBillEntityListByOrderIdListAndPending(UserBillEnum::TYPE_SHOP['Platform']['code'], $unsettledOrderIdList);
@@ -12091,15 +12106,25 @@ class StoreOrderRepository extends BaseRepository
                 $userBillRepository->executeByIdList($billIdList);
             }
 
-            /** 积分 */
+            /** 结算 积分 */
             /** @var UserSignScoreRepository $userSignScoreRepository */
             $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
-            $userSignScoreEntityList = $userSignScoreRepository->getStoreSignScoreEntityListByOrderIdListAndPending(UserSignScoreEnum::ORDER_TYPE['Platform']['code'], $unsettledOrderIdList);
+            $userSignScoreEntityList = $userSignScoreRepository->getUserSignScoreEntityListByOrderIdListAndPending(UserSignScoreEnum::ORDER_TYPE['Platform']['code'], $unsettledOrderIdList);
             if (!empty($userSignScoreEntityList)) {
                 $userSignScoreIdList = array_map(function ($userSignScoreEntity) {
                     return $userSignScoreEntity->getId();
                 }, $userSignScoreEntityList);
-
+                $userSignScoreRepository->executeByIdList($userSignScoreIdList);
+            }
+            /** 结算 贡献值 */
+            /** @var UserSignGongxianRepository $userSignGongxianRepository */
+            $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
+            $userSignGongxianEntityList = $userSignGongxianRepository->getUserSignGongxianEntityListByOrderIdListAndPending(UserSignGongxianEnum::ORDER_TYPE['Platform']['code'], $unsettledOrderIdList);
+            if (!empty($userSignGongxianEntityList)) {
+                $userSignGongxianIdList = array_map(function ($userSignGongxianEntity) {
+                    return $userSignGongxianEntity->getId();
+                }, $userSignGongxianEntityList);
+                $userSignGongxianRepository->executeByIdList($userSignGongxianIdList);
             }
 
             foreach ($storeOrderEntityList as $storeOrderEntity) {

app/common/repositories/user/UserBillRepository.php

@@ -570,7 +570,8 @@ class UserBillRepository extends BaseRepository
                 // 更新 账单记录 状态
                 $updateUserBillEntity
                     ->setBillId($userBillEntity->getBillId())
-                    ->setStatus(UserBillEnum::STATUS['VALID']['code']);
+                    ->setStatus(UserBillEnum::STATUS['VALID']['code'])
+                    ->setTakeTime(time());
 
                 if ($userBillEntity->getCommissionType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
                     // 直推奖

app/common/repositories/user/UserSignGongxianRepository.php

@@ -6,7 +6,9 @@ use app\common\dao\user\UserSignGongxianDao;
 use app\common\enum\user\UserSignGongxianEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
 use app\entity\data\user\UserSignGongxianEntity;
+use think\db\exception\DbException;
 use think\exception\ValidateException;
 
 class UserSignGongxianRepository extends BaseRepository
@@ -16,6 +18,41 @@ class UserSignGongxianRepository extends BaseRepository
         $this->dao = $dao;
     }
 
+    /**
+     * @param int $id
+     * @return UserSignGongxianEntity
+     */
+    public function getUserSignGongxianEntityById(int $id): UserSignGongxianEntity
+    {
+        $entityList = $this->getUserSignGongxianEntityListByIdList([$id]);
+        $entity = array_shift($entityList);
+        if ($entity instanceof UserSignGongxianEntity) {
+            return $entity;
+        } else {
+            /** @var UserSignGongxianEntity */
+            return UserSignGongxianEntity::newInstance();
+        }
+    }
+
+    /**
+     * @param array $idList
+     * @return UserSignGongxianEntity[]
+     */
+    public function getUserSignGongxianEntityListByIdList(array $idList): array
+    {
+        return $this->dao->getUserSignGongxianEntityListByIdList($idList);
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignGongxianEntity[]
+     */
+    public function getUserSignGongxianEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserSignGongxianEntityListByOrderIdListAndPending($orderType, $orderIdList);
+    }
+    
     public function create($data)
     {
         return $this->dao->create($data);
@@ -76,4 +113,128 @@ class UserSignGongxianRepository extends BaseRepository
         return $this->createByEntity($userSignGongxianEntity);
     }
 
+    /**
+     * 将 贡献值 直推贡献值 记录设置为生效状态 并对用户的 贡献值 直推贡献值 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userSignGongxianEntityList = $this->getUserSignGongxianEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userSignGongxianEntityList = array_filter($userSignGongxianEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserSignGongxianEnum::STATUS['PendingConfirmation']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
+            }
+            return false;
+        });
+
+        if (!empty($userSignGongxianEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserSignGongxianEntity[] $updateUserScoreEntityList */
+            $updateUserScoreEntityList = [];
+            foreach ($userSignGongxianEntityList as $userSignGongxianEntity) {
+
+                $userEntity = $userEntityMapByUid[$userSignGongxianEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(GongxianId:{$userSignGongxianEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setContribute($userEntity->getContribute())
+                        ->setPerContribute($userEntity->getPerContribute());
+                }
+                // 组建 账单 记录
+                if (isset($updateUserScoreEntityList[$userSignGongxianEntity->getId()])) {
+                    $updateUserSignGongxianEntity = $updateUserScoreEntityList[$userSignGongxianEntity->getId()];
+                } else {
+                    /** @var UserSignGongxianEntity $updateUserSignGongxianEntity */
+                    $updateUserSignGongxianEntity = UserSignGongxianEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserSignGongxianEntity
+                        ->setId($userSignGongxianEntity->getId())
+                        ->setStatus(UserSignGongxianEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+
+                if ($userSignGongxianEntity->getType() == UserSignGongxianEnum::TYPE['Consume']['code']) {
+                    // 消耗
+                    if (strpos($userSignGongxianEntity->getMark(), '购买') !== false) {
+                        $updateUserEntity->setContribute(bcsub($updateUserEntity->getContribute(), $userSignGongxianEntity->getNumber(), 2));
+                        if ($updateUserEntity->getContribute() < 0.00) {
+                            throw new ValidateException('用户贡献值不足');
+                        }
+                        $updateUserSignGongxianEntity->setSurplus($updateUserEntity->getContribute());
+                    } else if (strpos($userSignGongxianEntity->getMark(), '推广') !== false) {
+                        $updateUserEntity->setPerContribute(bcsub($updateUserEntity->getPerContribute(), $userSignGongxianEntity->getNumber(), 2));
+                        if ($updateUserEntity->getPerContribute() < 0.00) {
+                            throw new ValidateException('用户推广贡献值不足');
+                        }
+                        $updateUserSignGongxianEntity->setSurplus($updateUserEntity->getPerContribute());
+                    }
+                } else {
+                    if (strpos($userSignGongxianEntity->getMark(), '购买') !== false) {
+                        $updateUserEntity->setContribute(bcadd($updateUserEntity->getContribute(), $userSignGongxianEntity->getNumber(), 2));
+                        $updateUserSignGongxianEntity->setSurplus($updateUserEntity->getContribute());
+                    } else if (strpos($userSignGongxianEntity->getMark(), '推广') !== false) {
+                        $updateUserEntity->setPerContribute(bcadd($updateUserEntity->getPerContribute(), $userSignGongxianEntity->getNumber(), 2));
+                        $updateUserSignGongxianEntity->setSurplus($updateUserEntity->getPerContribute());
+                    }
+                }
+
+                $updateUserEntityList[$userSignGongxianEntity->getUid()] = $updateUserEntity;
+                $updateUserScoreEntityList[$userSignGongxianEntity->getId()] = $updateUserSignGongxianEntity;
+            }
+            try {
+                if (!empty($updateUserEntityList)) {
+                    $userRepository->batchUpdateUserDataByDataList(
+                        array_map(function (UserEntity $updateUserEntity) {
+                            return $updateUserEntity->toUnderlineArray();
+                        }, $updateUserEntityList)
+                    );
+                }
+
+                if (!empty($updateUserBillEntityList)) {
+                    $this->batchUpdateUserSignGongxianDataByDataList(
+                        array_map(function (UserSignGongxianEntity $updateUserSignGongxianEntity) {
+                            return $updateUserSignGongxianEntity->toUnderlineArray();
+                        }, $updateUserScoreEntityList)
+                    );
+                }
+            } catch (DbException $e) {
+
+            }
+        }
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserSignGongxianDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
+    }
 }

app/common/repositories/user/UserSignScoreRepository.php

@@ -27,9 +27,9 @@ class UserSignScoreRepository extends BaseRepository
      * @param int $id
      * @return UserSignScoreEntity
      */
-    public function getStoreSignScoreEntityById(int $id): UserSignScoreEntity
+    public function getUserSignScoreEntityById(int $id): UserSignScoreEntity
     {
-        $entityList = $this->getStoreSignScoreEntityListByIdList([$id]);
+        $entityList = $this->getUserSignScoreEntityListByIdList([$id]);
         $entity = array_shift($entityList);
         if ($entity instanceof UserSignScoreEntity) {
             return $entity;
@@ -43,9 +43,9 @@ class UserSignScoreRepository extends BaseRepository
      * @param array $idList
      * @return UserSignScoreEntity[]
      */
-    public function getStoreSignScoreEntityListByIdList(array $idList): array
+    public function getUserSignScoreEntityListByIdList(array $idList): array
     {
-        return $this->dao->getStoreSignScoreEntityListByIdList($idList);
+        return $this->dao->getUserSignScoreEntityListByIdList($idList);
     }
 
     /**
@@ -53,9 +53,9 @@ class UserSignScoreRepository extends BaseRepository
      * @param array $orderIdList
      * @return UserSignScoreEntity[]
      */
-    public function getStoreSignScoreEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    public function getUserSignScoreEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
     {
-        return $this->dao->getUserBillEntityListByOrderIdListAndPending($orderType, $orderIdList);
+        return $this->dao->getUserSignScoreEntityListByOrderIdListAndPending($orderType, $orderIdList);
     }
 
     /**
@@ -116,60 +116,22 @@ class UserSignScoreRepository extends BaseRepository
     /**
      * 将 积分 记录设置为生效状态 并对用户的 积分 字段进行增减
      * @param int $id
-     * @return UserSignScoreEntity
+     * @return int
      */
-    public function execute(int $id): UserSignScoreEntity
+    public function execute(int $id): int
     {
-        $userSignScoreEntity = $this->getStoreSignScoreEntityById($id);
-        if (empty($userSignScoreEntity->getId()) || empty($userSignScoreEntity->getUid())) {
-            throw new ValidateException('无效的积分记录');
-        }
-        if ($userSignScoreEntity->getStatus() == UserSignScoreEnum::STATUS['Invalid']['code']) {
-            throw new ValidateException('该积分记录已失效');
-        }
-        if (!empty($userSignScoreEntity->getSettlementTime()) || $userSignScoreEntity->getStatus() == UserSignScoreEnum::STATUS['Valid']['code']) {
-            throw new ValidateException('该积分记录已更新，请勿重复操作');
-        }
-
-        /** @var UserRepository $userRepository */
-        $userRepository = app()->make(UserRepository::class);
-        $userEntity = $userRepository->getUserEntityByUid($userSignScoreEntity->getUid());
-        if (empty($userEntity->getUid())) {
-            throw new ValidateException('未查询到用户信息');
-        }
-        if ($userSignScoreEntity->getPm() == UserSignScoreEnum::PM['Expend']['code']) {
-            $surplus = bcsub($userEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2);
-            if ($surplus < 0.00) {
-                throw new ValidateException('用户积分不足');
-            }
-        } else {
-            $surplus = bcadd($userEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2);
-        }
-        try {
-            $userSignScoreEntity
-                ->setSurplus($surplus)
-                ->setSettlementTime(date('Y-m-d H:i:s'))
-                ->setStatus(UserSignScoreEnum::STATUS['Valid']['code']);
-            $userRepository->update($userEntity->getUid(), ['score' => $surplus]);
-            $this->dao->update($userSignScoreEntity->getId(), [
-                'surplus' => $userSignScoreEntity->getSurplus(),
-                'settlement_time' => $userSignScoreEntity->getSettlementTime(),
-                'status' => $userSignScoreEntity->getStatus()
-            ]);
-        } catch (DbException $e) {
-
-        }
-        return $userSignScoreEntity;
+        $result = $this->executeByIdList([$id]);
+        return array_shift($result);
     }
 
     /**
      * 将 积分 记录设置为生效状态 并对用户的 积分 字段进行增减
      * @param array $idList
-     * @return UserSignScoreEntity
+     * @return array
      */
-    public function executeByIdList(array $idList): UserSignScoreEntity
+    public function executeByIdList(array $idList): array
     {
-        $userSignScoreEntityList = $this->getStoreSignScoreEntityListByIdList($idList);
+        $userSignScoreEntityList = $this->getUserSignScoreEntityListByIdList($idList);
         $userIdList = [];
 
         // 忽略 已经生效的 记录
@@ -192,7 +154,9 @@ class UserSignScoreRepository extends BaseRepository
                 $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
             }
 
+            /** @var UserEntity[] $updateUserEntityList */
             $updateUserEntityList = [];
+            /** @var UserSignScoreEntity[] $updateUserScoreEntityList */
             $updateUserScoreEntityList = [];
             foreach ($userSignScoreEntityList as $userSignScoreEntity) {
                 // if (empty($userSignScoreEntity->getId()) || empty($userSignScoreEntity->getUid())) {
@@ -209,36 +173,74 @@ class UserSignScoreRepository extends BaseRepository
                 if (empty($userEntity) || empty($userEntity->getUid())) {
                     throw new ValidateException("未查询到用户信息(scoreId:{$userSignScoreEntity->getId()})");
                 }
-                // 更新 用户信息
-                /** @var UserEntity $updateUserEntity */
-                $updateUserEntity = $updateUserEntityList[$userEntity->getUid()] ?? UserEntity::newInstance();
-                $updateUserEntity->setUid($userEntity->getUid());
 
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setScore($userEntity->getScore());
+
+                }
+                // 组建 账单 记录
+                if (isset($updateUserScoreEntityList[$userSignScoreEntity->getId()])) {
+                    $updateUserSignScoreEntity = $updateUserScoreEntityList[$userSignScoreEntity->getId()];
+                } else {
+                    /** @var UserSignScoreEntity $updateUserSignScoreEntity */
+                    $updateUserSignScoreEntity = UserSignScoreEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserSignScoreEntity
+                        ->setId($userSignScoreEntity->getId())
+                        ->setStatus(UserSignScoreEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(time());
+                }
 
                 if ($userSignScoreEntity->getPm() == UserSignScoreEnum::PM['Expend']['code']) {
-                    $surplus = bcsub($userEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2);
-                    if ($surplus < 0.00) {
+                    // 支出
+                    $updateUserEntity->setScore(bcsub($updateUserEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2));
+                    if ($updateUserEntity->getScore() < 0.00) {
                         throw new ValidateException('用户积分不足');
                     }
                 } else {
-                    $surplus = bcadd($userEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2);
+                    $updateUserEntity->setScore(bcadd($updateUserEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2));
+                }
+                $updateUserSignScoreEntity->setSurplus($updateUserEntity->getScore());
+
+                $updateUserEntityList[$userSignScoreEntity->getUid()] = $updateUserEntity;
+                $updateUserScoreEntityList[$userSignScoreEntity->getId()] = $updateUserSignScoreEntity;
+            }
+            try {
+                if (!empty($updateUserEntityList)) {
+                    $userRepository->batchUpdateUserDataByDataList(
+                        array_map(function (UserEntity $updateUserEntity) {
+                            return $updateUserEntity->toUnderlineArray();
+                        }, $updateUserEntityList)
+                    );
                 }
-                try {
-                    $userSignScoreEntity
-                        ->setSurplus($surplus)
-                        ->setSettlementTime(date('Y-m-d H:i:s'))
-                        ->setStatus(UserSignScoreEnum::STATUS['Valid']['code']);
-                    $userRepository->update($userEntity->getUid(), ['score' => $surplus]);
-                    $this->dao->update($userSignScoreEntity->getId(), [
-                        'surplus' => $userSignScoreEntity->getSurplus(),
-                        'settlement_time' => $userSignScoreEntity->getSettlementTime(),
-                        'status' => $userSignScoreEntity->getStatus()
-                    ]);
-                } catch (DbException $e) {
 
+                if (!empty($updateUserBillEntityList)) {
+                    $this->batchUpdateUserSignScoreDataByDataList(
+                        array_map(function (UserSignScoreEntity $updateUserSignScoreEntity) {
+                            return $updateUserSignScoreEntity->toUnderlineArray();
+                        }, $updateUserScoreEntityList)
+                    );
                 }
-                return $userSignScoreEntity;
+            } catch (DbException $e) {
+
             }
         }
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserSignScoreDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
     }
 }