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

app/common/enum/user/UserCertificationEnum.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserCertificationEnum extends CommonEnum
+{
+    // 用户认证状态枚举
+    const STATUS = [
+        'Pending' => ['code' => 0, 'name' => '未审核'],
+        'Approved' => ['code' => 1, 'name' => '已通过'],
+        'Rejected' => ['code' => 2, 'name' => '已拒绝'],
+    ];
+}

app/common/repositories/user/UserBillRepository.php

@@ -504,37 +504,52 @@ class UserBillRepository extends BaseRepository
             }, $userBillEntityList);
             /** @var UserEntity[] $userEntityList */
             $userEntityList = [];
+            /** @var UserEntity[] $userEntityMapByUid */
             $userEntityMapByUid = [];
 
             if (!empty($userIdList)) {
                 /** @var UserRepository $userRepository */
                 $userRepository = app()->make(UserRepository::class);
                 $userEntityList = $userRepository->getUserEntityListByUidList($userIdList);
-                $userEntityMapByUid = array_map(function ($userEntity) {
+                /** @var UserEntity[] $userEntityMapByUid */
+                $userEntityMapByUid = array_column($userEntityList, null, 'uid');
+
 
-                }, $userEntityList);
             }
 
+            $updateUserDataList = [];
+            $updateUserBillDataList = [];
             foreach ($userBillEntityList as $userBillEntity) {
                 if (empty($userBillEntity->getBillId()) || empty($userBillEntity->getUid())) {
-                    throw new ValidateException('无效的账单记录');
+                    // throw new ValidateException('无效的账单记录');
+                    continue;
                 }
                 if (!empty($userBillEntity->getTakeTime())) {
-                    throw new ValidateException('该账单记录已更新，请勿重复操作');
+                    throw new ValidateException("该账单记录已更新，请勿重复操作({$userBillEntity->getBillId()})");
                 }
 
-                $userEntity = $userRepository->getUserEntityByUid($userBillEntity->getUid());
-                if (empty($userEntity->getUid())) {
-                    throw new ValidateException('未查询到用户信息');
+                $userEntity = $userEntityMapByUid[$userBillEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息({$userBillEntity->getBillId()})");
                 }
                 if ($userBillEntity->getType() == UserBillEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code']) {
                     // 直推奖
-                    $surplus = bcsub($userEntity->getVr(), $userBillEntity->getNumber(), 2);
-                    if ($surplus < 0.00) {
-                        throw new ValidateException('用户VR不足');
+                    if (!isset($updateUserDataList[$userEntity->getUid()]['brokerage_price'])) {
+                        $updateUserDataList[$userEntity->getUid()]['brokerage_price'] = $userEntity->getBrokeragePrice();
                     }
-                } else {
-                    $surplus = bcadd($userEntity->getVr(), $userBillEntity->getNumber(), 2);
+                    // 更新用户 信息
+                    if ($userBillEntity->getPm() == UserBillEnum::PM['EXPEND']['code']) {
+                        if ($updateUserDataList[$userBillEntity->getUid()]['brokerage_price'] < $userBillEntity->getNumber()) {
+                            throw new ValidateException('用户佣金不足');
+                        }
+                        $updateUserDataList[$userBillEntity->getUid()]['brokerage_price'] -= $userBillEntity->getNumber();
+                    } 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']) {
+
                 }
 
 

app/entity/CommonEntity.php

@@ -60,6 +60,9 @@ class CommonEntity
         $camelArray = $this->toArray(); // 先获取驼峰格式的数组
 
         foreach ($camelArray as $key => $value) {
+            if (is_null($value)) {
+                continue;
+            }
             // 将驼峰键名转为下划线格式
             $underlineKey = $this->camelToUnderline($key);
             $result[$underlineKey] = $value;

app/entity/data/user/UserCertificationEntity.php

@@ -0,0 +1,237 @@
+<?php
+
+namespace app\entity\data\user;
+
+use app\entity\data\DataEntity;
+
+class UserCertificationEntity extends DataEntity
+{
+    public $id = null;  // 用户认证ID
+    public $userName = null;  // 认证姓名
+    public $mobile = null;  // 认证手机号
+    public $userCard = null;  // 身份证号
+    public $cardPositive = null;  // 身份证正面照
+    public $cardReverse = null;  // 身份证反面照
+    public $status = null;  // 认证状态：0未审核，1已通过，2已拒绝
+    public $reason = null;  // 拒绝原因
+    public $auditTime = null;  // 审核时间
+    public $createTime = null;  // 提交审核时间
+    public $updateTime = null;  // 修改时间
+    public $uid = null;  // 用户ID
+
+    /**
+     * @return mixed
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param mixed $id
+     * @return UserCertificationEntity
+     */
+    public function setId($id): UserCertificationEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUserName()
+    {
+        return $this->userName;
+    }
+
+    /**
+     * @param mixed $userName
+     * @return UserCertificationEntity
+     */
+    public function setUserName($userName): UserCertificationEntity
+    {
+        $this->userName = $userName;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getMobile()
+    {
+        return $this->mobile;
+    }
+
+    /**
+     * @param mixed $mobile
+     * @return UserCertificationEntity
+     */
+    public function setMobile($mobile): UserCertificationEntity
+    {
+        $this->mobile = $mobile;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUserCard()
+    {
+        return $this->userCard;
+    }
+
+    /**
+     * @param mixed $userCard
+     * @return UserCertificationEntity
+     */
+    public function setUserCard($userCard): UserCertificationEntity
+    {
+        $this->userCard = $userCard;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCardPositive()
+    {
+        return $this->cardPositive;
+    }
+
+    /**
+     * @param mixed $cardPositive
+     * @return UserCertificationEntity
+     */
+    public function setCardPositive($cardPositive): UserCertificationEntity
+    {
+        $this->cardPositive = $cardPositive;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCardReverse()
+    {
+        return $this->cardReverse;
+    }
+
+    /**
+     * @param mixed $cardReverse
+     * @return UserCertificationEntity
+     */
+    public function setCardReverse($cardReverse): UserCertificationEntity
+    {
+        $this->cardReverse = $cardReverse;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param mixed $status
+     * @return UserCertificationEntity
+     */
+    public function setStatus($status): UserCertificationEntity
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getReason()
+    {
+        return $this->reason;
+    }
+
+    /**
+     * @param mixed $reason
+     * @return UserCertificationEntity
+     */
+    public function setReason($reason): UserCertificationEntity
+    {
+        $this->reason = $reason;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getAuditTime()
+    {
+        return $this->auditTime;
+    }
+
+    /**
+     * @param mixed $auditTime
+     * @return UserCertificationEntity
+     */
+    public function setAuditTime($auditTime): UserCertificationEntity
+    {
+        $this->auditTime = $auditTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    /**
+     * @param mixed $createTime
+     * @return UserCertificationEntity
+     */
+    public function setCreateTime($createTime): UserCertificationEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUpdateTime()
+    {
+        return $this->updateTime;
+    }
+
+    /**
+     * @param mixed $updateTime
+     * @return UserCertificationEntity
+     */
+    public function setUpdateTime($updateTime): UserCertificationEntity
+    {
+        $this->updateTime = $updateTime;
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUid()
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param mixed $uid
+     * @return UserCertificationEntity
+     */
+    public function setUid($uid): UserCertificationEntity
+    {
+        $this->uid = $uid;
+        return $this;
+    }
+}