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

app/common/repositories/user/UserSignScoreRepository.php

@@ -6,6 +6,7 @@ use app\common\dao\user\UserSignScoreDao;
 use app\common\enum\user\UserSignScoreEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
 use app\entity\data\user\UserSignScoreEntity;
 use think\db\exception\DbException;
 use think\exception\ValidateException;
@@ -163,64 +164,81 @@ class UserSignScoreRepository extends BaseRepository
 
     /**
      * 将 积分 记录设置为生效状态 并对用户的 积分 字段进行增减
-     * @param int $id
+     * @param array $idList
      * @return UserSignScoreEntity
      */
     public function executeByIdList(array $idList): UserSignScoreEntity
     {
         $userSignScoreEntityList = $this->getStoreSignScoreEntityListByIdList($idList);
-
-        // 忽略 已经生效的 记录 todo 把要获取的 用户列表等信息 从这里获取 use ()
-        $userSignScoreEntityList = array_filter($userSignScoreEntityList, function($entity) {
-            // 用户不为空 状态属于待结算 并且结算字段为空
-            return (!empty($entity->getId()) &&  !empty($entity->getUid()) && ($entity->getStatus() == UserSignScoreEnum::STATUS['Pending']['code']) && empty($entity->getSettlementTime()));
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userSignScoreEntityList = array_filter($userSignScoreEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserSignScoreEnum::STATUS['Pending']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
+            }
+            return false;
         });
 
         if (!empty($userSignScoreEntityList)) {
-
-        }
-
-        foreach ($userSignScoreEntityList as $userSignScoreEntity) {
-            // 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('未查询到用户信息');
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
             }
-            if ($userSignScoreEntity->getPm() == UserSignScoreEnum::PM['Expend']['code']) {
-                $surplus = bcsub($userEntity->getScore(), $userSignScoreEntity->getRewardScore(), 2);
-                if ($surplus < 0.00) {
-                    throw new ValidateException('用户积分不足');
+
+            $updateUserEntityList = [];
+            $updateUserScoreEntityList = [];
+            foreach ($userSignScoreEntityList as $userSignScoreEntity) {
+                // 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('该积分记录已更新，请勿重复操作');
+                // }
+
+                $userEntity = $userEntityMapByUid[$userSignScoreEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(scoreId:{$userSignScoreEntity->getId()})");
                 }
-            } 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) {
+                // 更新 用户信息
+                /** @var UserEntity $updateUserEntity */
+                $updateUserEntity = $updateUserEntityList[$userEntity->getUid()] ?? UserEntity::newInstance();
+                $updateUserEntity->setUid($userEntity->getUid());
+
+
+                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;
             }
-            return $userSignScoreEntity;
         }
-
     }
 }

app/entity/data/user/UserSignScoreEntity.php

@@ -6,289 +6,289 @@ use app\entity\data\DataEntity;
 
 class UserSignScoreEntity extends DataEntity
 {
-    public $id = 0;  // 自增id
-    public $uid = 0;  // 会员id
-    public $continuityDay = 0;  // 连续签到几天
-    public $rewardScore = 0.00;  // 赠送积分数量
-    public $signinTime = 0;  // 签到时间
-    public $sourceUid = 0;  // 赠送积分来源用户id
-    public $status = 0;  // 积分状态：1-有效，0-失效，-1待确认
-    public $mark = '';  // 备注
-    public $orderId = '';  // 订单id
-    public $pm = 1;  // 1-收入，2-支出
-    public $surplus = 0.00;  // 剩余
-    public $orderType = '';  // 订单类型，关联订单ID
-    public $addtime = 0;  // 添加时间
-    public $sourceType = 1;  // 积分来源类型：1签到，2分享好友注册赠送，3自己下单赠送，4好友下单赠送，5购买产品消耗
-    public $settlementTime = 0;  // 结算时间
+    public $id = null;  // 自增id
+    public $uid = null;  // 会员id
+    public $continuity_day = null;  // 连续签到几天
+    public $reward_score = null;  // 赠送积分数量
+    public $signin_time = null;  // 签到时间
+    public $source_uid = null;  // 赠送积分来源用户id
+    public $status = null;  // 积分状态1-有效 0-失效 -1待确认
+    public $mark = null;  // 备注
+    public $order_id = null;  // 订单id
+    public $pm = null;  // 1-收入。2-支出
+    public $surplus = null;  // 剩余
+    public $order_type = null;  // 订单类型。关联订单ID
+    public $addtime = null;  // 添加时间
+    public $source_type = null;  // 积分类型：1签到，2分享好友注册赠送，3自己下单赠送，4，好友下单赠送，5.购买产品消耗
+    public $settlement_time = null;  // 结算时间
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getId(): int
+    public function getId()
     {
         return $this->id;
     }
 
     /**
-     * @param int $id
+     * @param mixed $id
      * @return UserSignScoreEntity
      */
-    public function setId(int $id): UserSignScoreEntity
+    public function setId($id): UserSignScoreEntity
     {
         $this->id = $id;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getUid(): int
+    public function getUid()
     {
         return $this->uid;
     }
 
     /**
-     * @param int $uid
+     * @param mixed $uid
      * @return UserSignScoreEntity
      */
-    public function setUid(int $uid): UserSignScoreEntity
+    public function setUid($uid): UserSignScoreEntity
     {
         $this->uid = $uid;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getContinuityDay(): int
+    public function getContinuityDay()
     {
-        return $this->continuityDay;
+        return $this->continuity_day;
     }
 
     /**
-     * @param int $continuityDay
+     * @param mixed $continuity_day
      * @return UserSignScoreEntity
      */
-    public function setContinuityDay(int $continuityDay): UserSignScoreEntity
+    public function setContinuityDay($continuity_day): UserSignScoreEntity
     {
-        $this->continuityDay = $continuityDay;
+        $this->continuity_day = $continuity_day;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getRewardScore(): float
+    public function getRewardScore()
     {
-        return $this->rewardScore;
+        return $this->reward_score;
     }
 
     /**
-     * @param float $rewardScore
+     * @param mixed $reward_score
      * @return UserSignScoreEntity
      */
-    public function setRewardScore(float $rewardScore): UserSignScoreEntity
+    public function setRewardScore($reward_score): UserSignScoreEntity
     {
-        $this->rewardScore = $rewardScore;
+        $this->reward_score = $reward_score;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getSigninTime(): int
+    public function getSigninTime()
     {
-        return $this->signinTime;
+        return $this->signin_time;
     }
 
     /**
-     * @param int $signinTime
+     * @param mixed $signin_time
      * @return UserSignScoreEntity
      */
-    public function setSigninTime(int $signinTime): UserSignScoreEntity
+    public function setSigninTime($signin_time): UserSignScoreEntity
     {
-        $this->signinTime = $signinTime;
+        $this->signin_time = $signin_time;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getSourceUid(): int
+    public function getSourceUid()
     {
-        return $this->sourceUid;
+        return $this->source_uid;
     }
 
     /**
-     * @param int $sourceUid
+     * @param mixed $source_uid
      * @return UserSignScoreEntity
      */
-    public function setSourceUid(int $sourceUid): UserSignScoreEntity
+    public function setSourceUid($source_uid): UserSignScoreEntity
     {
-        $this->sourceUid = $sourceUid;
+        $this->source_uid = $source_uid;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getStatus(): int
+    public function getStatus()
     {
         return $this->status;
     }
 
     /**
-     * @param int $status
+     * @param mixed $status
      * @return UserSignScoreEntity
      */
-    public function setStatus(int $status): UserSignScoreEntity
+    public function setStatus($status): UserSignScoreEntity
     {
         $this->status = $status;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getMark(): string
+    public function getMark()
     {
         return $this->mark;
     }
 
     /**
-     * @param string $mark
+     * @param mixed $mark
      * @return UserSignScoreEntity
      */
-    public function setMark(string $mark): UserSignScoreEntity
+    public function setMark($mark): UserSignScoreEntity
     {
         $this->mark = $mark;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderId(): string
+    public function getOrderId()
     {
-        return $this->orderId;
+        return $this->order_id;
     }
 
     /**
-     * @param string $orderId
+     * @param mixed $order_id
      * @return UserSignScoreEntity
      */
-    public function setOrderId(string $orderId): UserSignScoreEntity
+    public function setOrderId($order_id): UserSignScoreEntity
     {
-        $this->orderId = $orderId;
+        $this->order_id = $order_id;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getPm(): int
+    public function getPm()
     {
         return $this->pm;
     }
 
     /**
-     * @param int $pm
+     * @param mixed $pm
      * @return UserSignScoreEntity
      */
-    public function setPm(int $pm): UserSignScoreEntity
+    public function setPm($pm): UserSignScoreEntity
     {
         $this->pm = $pm;
         return $this;
     }
 
     /**
-     * @return float
+     * @return mixed
      */
-    public function getSurplus(): float
+    public function getSurplus()
     {
         return $this->surplus;
     }
 
     /**
-     * @param float $surplus
+     * @param mixed $surplus
      * @return UserSignScoreEntity
      */
-    public function setSurplus(float $surplus): UserSignScoreEntity
+    public function setSurplus($surplus): UserSignScoreEntity
     {
         $this->surplus = $surplus;
         return $this;
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getOrderType(): string
+    public function getOrderType()
     {
-        return $this->orderType;
+        return $this->order_type;
     }
 
     /**
-     * @param string $orderType
+     * @param mixed $order_type
      * @return UserSignScoreEntity
      */
-    public function setOrderType(string $orderType): UserSignScoreEntity
+    public function setOrderType($order_type): UserSignScoreEntity
     {
-        $this->orderType = $orderType;
+        $this->order_type = $order_type;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getAddtime(): int
+    public function getAddtime()
     {
         return $this->addtime;
     }
 
     /**
-     * @param int $addtime
+     * @param mixed $addtime
      * @return UserSignScoreEntity
      */
-    public function setAddtime(int $addtime): UserSignScoreEntity
+    public function setAddtime($addtime): UserSignScoreEntity
     {
         $this->addtime = $addtime;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getSourceType(): int
+    public function getSourceType()
     {
-        return $this->sourceType;
+        return $this->source_type;
     }
 
     /**
-     * @param int $sourceType
+     * @param mixed $source_type
      * @return UserSignScoreEntity
      */
-    public function setSourceType(int $sourceType): UserSignScoreEntity
+    public function setSourceType($source_type): UserSignScoreEntity
     {
-        $this->sourceType = $sourceType;
+        $this->source_type = $source_type;
         return $this;
     }
 
     /**
-     * @return int
+     * @return mixed
      */
-    public function getSettlementTime(): int
+    public function getSettlementTime()
     {
-        return $this->settlementTime;
+        return $this->settlement_time;
     }
 
     /**
-     * @param int $settlementTime
+     * @param mixed $settlement_time
      * @return UserSignScoreEntity
      */
-    public function setSettlementTime(int $settlementTime): UserSignScoreEntity
+    public function setSettlementTime($settlement_time): UserSignScoreEntity
     {
-        $this->settlementTime = $settlementTime;
+        $this->settlement_time = $settlement_time;
         return $this;
     }
 }