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

app/common/dao/user/UserSignScoreDao.php

@@ -3,9 +3,13 @@
 namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
+use app\common\enum\user\UserSignScoreEnum;
 use app\common\model\user\UserSignScore;
 use app\entity\CommonEntity;
 use app\entity\data\user\UserSignScoreEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 class UserSignScoreDao extends BaseDao
 {
@@ -38,4 +42,30 @@ class UserSignScoreDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignScoreEntity[]
+     */
+    public function getUserBillEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            $dataList = UserSignScore::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserSignScoreEnum::STATUS['Pending']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignScoreEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
 }

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

@@ -12068,29 +12068,39 @@ class StoreOrderRepository extends BaseRepository
             /** @var UserRepository $userRepository */
             $userRepository = app()->make(UserRepository::class);
 
-            // 筛选
-            $existOrderIdList = [];
+            // 筛选 未结算的 订单ID
+            $unsettledOrderIdList = [];
             foreach ($storeOrderEntityList as $storeOrderEntity) {
                 if ($storeOrderEntity->getIsSettlement() == StoreOrderEnum::IS_SETTLEMENT['NO']['code']) {
-                    $existOrderIdList[] = $storeOrderEntity->getOrderId();
+                    $unsettledOrderIdList[] = $storeOrderEntity->getOrderId();
                 }
             }
-            if (empty($existOrderIdList)) {
+            if (empty($unsettledOrderIdList)) {
                 return;
             }
 
             /** 养老金 佣金 */
             /** @var UserBillRepository $userBillRepository */
             $userBillRepository = app()->make(UserBillRepository::class);
-            $userBillEntityList = $userBillRepository->getUserBillEntityListByOrderIdListAndPending(UserBillEnum::TYPE_SHOP['Platform']['code'], $existOrderIdList);
+            $userBillEntityList = $userBillRepository->getUserBillEntityListByOrderIdListAndPending(UserBillEnum::TYPE_SHOP['Platform']['code'], $unsettledOrderIdList);
             if (!empty($userBillEntityList)) {
                 $billIdList = array_map(function ($userBillEntity) {
                     return $userBillEntity->getBillId();
                 }, $userBillEntityList);
+                // 去结算 养老金 和佣金
                 $userBillRepository->executeByIdList($billIdList);
             }
 
+            /** 积分 */
+            /** @var UserSignScoreRepository $userSignScoreRepository */
+            $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
+            $userSignScoreEntityList = $userSignScoreRepository->getStoreSignScoreEntityListByOrderIdListAndPending(UserSignScoreEnum::ORDER_TYPE['Platform']['code'], $unsettledOrderIdList);
+            if (!empty($userSignScoreEntityList)) {
+                $userSignScoreIdList = array_map(function ($userSignScoreEntity) {
+                    return $userSignScoreEntity->getId();
+                }, $userSignScoreEntityList);
 
+            }
 
             foreach ($storeOrderEntityList as $storeOrderEntity) {
                 // 结算养老金

app/common/repositories/user/UserSignScoreRepository.php

@@ -48,6 +48,16 @@ class UserSignScoreRepository extends BaseRepository
     }
 
     /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignScoreEntity[]
+     */
+    public function getStoreSignScoreEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserBillEntityListByOrderIdListAndPending($orderType, $orderIdList);
+    }
+
+    /**
      * 写入积分记录
      * @param UserSignScoreEntity $userSignScoreEntity
      * @return UserSignScoreEntity
@@ -150,4 +160,67 @@ class UserSignScoreRepository extends BaseRepository
         }
         return $userSignScoreEntity;
     }
+
+    /**
+     * 将 积分 记录设置为生效状态 并对用户的 积分 字段进行增减
+     * @param int $id
+     * @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()));
+        });
+
+        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('未查询到用户信息');
+            }
+            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;
+        }
+
+    }
 }