Merge remote-tracking branch 'origin/dev' into dev

app/common/dao/user/UserSignFugouDao.php

@@ -3,12 +3,20 @@
 namespace app\common\dao\user;
 
 use app\common\dao\BaseDao;
+use app\common\enum\user\UserSignFugouEnum;
+use app\common\model\BaseModel;
 use app\common\model\user\UserSignFugou;
 use app\entity\CommonEntity;
 use app\entity\data\user\UserSignFugouEntity;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 class UserSignFugouDao extends BaseDao
 {
+    /**
+     * @return BaseModel
+     */
     protected function getModel(): string
     {
         return UserSignFugou::class;
@@ -18,7 +26,7 @@ class UserSignFugouDao extends BaseDao
      * @param array $idList
      * @return CommonEntity[]
      */
-    public function getStoreSignFugouEntityListByIdList(array $idList): array
+    public function getUserSignFugouEntityListByIdList(array $idList): array
     {
         $entityList = [];
         try {
@@ -38,4 +46,46 @@ class UserSignFugouDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignFugouEntity[]
+     */
+    public function getUserSignFugouEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        $entityList = [];
+        try {
+            /** @var UserSignFugou $model */
+            $model = $this->getModel();
+            $dataList = $model::getDB()
+                ->where('order_type', '=', $orderType)
+                ->whereIn('order_id', $orderIdList)
+                ->where('status', '=', UserSignFugouEnum::STATUS['Pending']['code'])
+                ->select()
+                ->toArray();
+            if (!empty($dataList)) {
+                $entityList = array_map(function ($data) {
+                    return UserSignFugouEntity::newInstance($data);
+                }, $dataList);
+            }
+        } catch (DataNotFoundException|ModelNotFoundException|DbException $e) {
+
+        }
+        return $entityList;
+    }
+
+    /**
+     * 批量更新
+     * @param $dataList
+     * @return array
+     */
+    public function saveAll($dataList): array
+    {
+        try {
+            return $this->getModel()::getInstance()->allowField(array_keys(reset($dataList)))->saveAll($dataList)->toArray();
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

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

@@ -11649,6 +11649,17 @@ class StoreOrderRepository extends BaseRepository
                 $userBillRepository->executeByIdList($billIdList);
             }
 
+            /** @var UserSignFugouRepository $userSignFugouRepository */
+            $userSignFugouRepository = app()->make(UserSignFugouRepository::class);
+            $userSignFugouEntityList = $userSignFugouRepository->getUserSignFugouEntityListByOrderIdListAndPending(UserSignFugouEnum::ORDER_TYPE['Platform']['code'], $unsettledOrderIdList);
+            if (!empty($userSignFugouEntityList)) {
+                $fugouIdList = array_map(function ($userSignFugouEntity) {
+                    return $userSignFugouEntity->getId();
+                }, $userSignFugouEntityList);
+                // 去结算 养老金 和佣金
+                $userSignFugouRepository->executeByIdList($fugouIdList);
+            }
+
             /** 结算 积分 */
             /** @var UserSignScoreRepository $userSignScoreRepository */
             $userSignScoreRepository = app()->make(UserSignScoreRepository::class);

app/common/repositories/user/UserSignFugouRepository.php

@@ -6,6 +6,7 @@ use app\common\dao\user\UserSignFugouDao;
 use app\common\enum\user\UserSignFugouEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
+use app\entity\data\user\UserEntity;
 use app\entity\data\user\UserSignFugouEntity;
 use think\db\exception\DbException;
 use think\exception\ValidateException;
@@ -21,9 +22,9 @@ class UserSignFugouRepository extends BaseRepository
      * @param int $id
      * @return UserSignFugouEntity
      */
-    public function getStoreSignFugouEntityById(int $id): UserSignFugouEntity
+    public function getUserSignFugouEntityById(int $id): UserSignFugouEntity
     {
-        $entityList = $this->getStoreSignFugouEntityListByIdList([$id]);
+        $entityList = $this->getUserSignFugouEntityListByIdList([$id]);
         $entity = array_shift($entityList);
         if ($entity instanceof UserSignFugouEntity) {
             return $entity;
@@ -37,9 +38,19 @@ class UserSignFugouRepository extends BaseRepository
      * @param array $idList
      * @return UserSignFugouEntity[]
      */
-    public function getStoreSignFugouEntityListByIdList(array $idList): array
+    public function getUserSignFugouEntityListByIdList(array $idList): array
     {
-        return $this->dao->getStoreSignFugouEntityListByIdList($idList);
+        return $this->dao->getUserSignFugouEntityListByIdList($idList);
+    }
+
+    /**
+     * @param string $orderType
+     * @param array $orderIdList
+     * @return UserSignFugouEntity[]
+     */
+    public function getUserSignFugouEntityListByOrderIdListAndPending(string $orderType, array $orderIdList): array
+    {
+        return $this->dao->getUserSignFugouEntityListByOrderIdListAndPending($orderType, $orderIdList);
     }
 
     public function create($data)
@@ -108,45 +119,118 @@ class UserSignFugouRepository extends BaseRepository
      */
     public function execute(int $id): UserSignFugouEntity
     {
-        $UserSignFugouEntity = $this->getStoreSignFugouEntityById($id);
-        if (empty($UserSignFugouEntity->getId()) || empty($UserSignFugouEntity->getUid())) {
-            throw new ValidateException('无效的复购记录');
-        }
-        if ($UserSignFugouEntity->getStatus() == UserSignFugouEnum::STATUS['Invalid']['code']) {
-            throw new ValidateException('该复购记录已失效');
-        }
-        if (!empty($UserSignFugouEntity->getSettlementTime()) || $UserSignFugouEntity->getStatus() == UserSignFugouEnum::STATUS['Valid']['code']) {
-            throw new ValidateException('该复购记录已更新，请勿重复操作');
-        }
+        $result = $this->executeByIdList([$id]);
+        return array_shift($result);
+    }
 
-        /** @var UserRepository $userRepository */
-        $userRepository = app()->make(UserRepository::class);
-        $userEntity = $userRepository->getUserEntityByUid($UserSignFugouEntity->getUid());
-        if (empty($userEntity->getUid())) {
-            throw new ValidateException('未查询到用户信息');
-        }
-        if ($UserSignFugouEntity->getType() == UserSignFugouEnum::TYPE['Consume']['code']) {
-            $surplus = bcsub($userEntity->getFugou(), $UserSignFugouEntity->getNumber(), 2);
-            if ($surplus < 0.00) {
-                throw new ValidateException('用户复购不足');
+    /**
+     * 将 复购 记录设置为生效状态 并对用户的 复购 字段进行增减
+     * @param array $idList
+     * @return array
+     */
+    public function executeByIdList(array $idList): array
+    {
+        $userSignFugouEntityList = $this->getUserSignFugouEntityListByIdList($idList);
+        $userIdList = [];
+
+        // 忽略 已经生效的 记录
+        $userSignFugouEntityList = array_filter($userSignFugouEntityList, function ($entity) use (&$userIdList) {
+            // 积分数据不为空 用户不为空 状态属于待结算 并且结算字段为空
+            if ((!empty($entity->getId()) && !empty($entity->getUid()) && ($entity->getStatus() == UserSignFugouEnum::STATUS['Pending']['code']) && empty($entity->getSettlementTime()))) {
+                $userIdList[] = $entity->getUid();
+                return true;
             }
-        } else {
-            $surplus = bcadd($userEntity->getFugou(), $UserSignFugouEntity->getNumber(), 2);
-        }
-        try {
-            $UserSignFugouEntity
-                ->setSurplus($surplus)
-                ->setSettlementTime(date('Y-m-d H:i:s'))
-                ->setStatus(UserSignFugouEnum::STATUS['Valid']['code']);
-            $userRepository->update($userEntity->getUid(), ['Fugou' => $surplus]);
-            $this->dao->update($UserSignFugouEntity->getId(), [
-                'surplus' => $UserSignFugouEntity->getSurplus(),
-                'settlement_time' => $UserSignFugouEntity->getSettlementTime(),
-                'status' => $UserSignFugouEntity->getStatus()
-            ]);
-        } catch (DbException $e) {
+            return false;
+        });
+
+        if (!empty($userSignFugouEntityList)) {
+            // 获取用户 映射信息
+            /** @var UserRepository $userRepository */
+            $userRepository = app()->make(UserRepository::class);
+            /** @var UserEntity[] $userEntityMapByUid */
+            $userEntityMapByUid = [];
+            if (!empty($userIdList)) {
+                $userEntityMapByUid = $userRepository->getUserEntityMapByUidList($userIdList);
+            }
+
+            /** @var UserEntity[] $updateUserEntityList */
+            $updateUserEntityList = [];
+            /** @var UserSignFugouEntity[] $updateUserFugouEntityList */
+            $updateUserFugouEntityList = [];
+            foreach ($userSignFugouEntityList as $userSignFugouEntity) {
+
+                $userEntity = $userEntityMapByUid[$userSignFugouEntity->getUid()];
+                if (empty($userEntity) || empty($userEntity->getUid())) {
+                    throw new ValidateException("未查询到用户信息(FugouId:{$userSignFugouEntity->getId()})");
+                }
+
+                // 组建 更新 用户信息
+                if (isset($updateUserEntityList[$userEntity->getUid()])) {
+                    $updateUserEntity = $updateUserEntityList[$userEntity->getUid()];
+                } else {
+                    /** @var UserEntity $updateUserEntity */
+                    $updateUserEntity = UserEntity::newInstance();
+                    $updateUserEntity
+                        ->setUid($userEntity->getUid())
+                        ->setFugou($userEntity->getFugou());
+
+                }
+                // 组建 账单 记录
+                if (isset($updateUserFugouEntityList[$userSignFugouEntity->getId()])) {
+                    $updateUserSignFugouEntity = $updateUserFugouEntityList[$userSignFugouEntity->getId()];
+                } else {
+                    /** @var UserSignFugouEntity $updateUserSignFugouEntity */
+                    $updateUserSignFugouEntity = UserSignFugouEntity::newInstance();
+                    // 更新 账单记录 状态
+                    $updateUserSignFugouEntity
+                        ->setId($userSignFugouEntity->getId())
+                        ->setStatus(UserSignFugouEnum::STATUS['Valid']['code'])
+                        ->setSettlementTime(date('Y-m-d H:i:s'));
+                }
+
+                if ($userSignFugouEntity->getType() == UserSignFugouEnum::TYPE['Consume']['code']) {
+                    // 支出
+                    $updateUserEntity->setFugou(bcsub($updateUserEntity->getFugou(), $userSignFugouEntity->getNumber(), 2));
+                    if ($updateUserEntity->getFugou() < 0.00) {
+                        throw new ValidateException('用户复购金不足');
+                    }
+                } else {
+                    $updateUserEntity->setFugou(bcadd($updateUserEntity->getFugou(), $userSignFugouEntity->getNumber(), 2));
+                }
+                $updateUserSignFugouEntity->setSurplus($updateUserEntity->getFugou());
 
+                $updateUserEntityList[$userSignFugouEntity->getUid()] = $updateUserEntity;
+                $updateUserFugouEntityList[$userSignFugouEntity->getId()] = $updateUserSignFugouEntity;
+            }
+            try {
+                if (!empty($updateUserEntityList)) {
+                    $userRepository->batchUpdateUserDataByDataList(
+                        array_map(function (UserEntity $updateUserEntity) {
+                            return $updateUserEntity->toUnderlineArray();
+                        }, $updateUserEntityList)
+                    );
+                }
+
+                if (!empty($updateUserFugouEntityList)) {
+                    $this->batchUpdateUserSignFugouDataByDataList(
+                        array_map(function (UserSignFugouEntity $updateUserSignFugouEntity) {
+                            return $updateUserSignFugouEntity->toUnderlineArray();
+                        }, $updateUserFugouEntityList)
+                    );
+                }
+            } catch (\Exception $e) {
+                throw new ValidateException('用户复购金结算失败');
+            }
         }
-        return $UserSignFugouEntity;
+        return $idList;
+    }
+
+    /**
+     * @param $dataList
+     * @return array
+     */
+    public function batchUpdateUserSignFugouDataByDataList($dataList): array
+    {
+        return $this->dao->saveAll($dataList);
     }
 }

app/common/repositories/user/UserSignGongxianRepository.php

@@ -214,7 +214,7 @@ class UserSignGongxianRepository extends BaseRepository
                 );
             }
 
-            if (!empty($updateUserBillEntityList)) {
+            if (!empty($updateUserScoreEntityList)) {
                 $this->batchUpdateUserSignGongxianDataByDataList(
                     array_map(function (UserSignGongxianEntity $updateUserSignGongxianEntity) {
                         return $updateUserSignGongxianEntity->toUnderlineArray();

app/common/repositories/user/UserSignScoreRepository.php

@@ -228,8 +228,8 @@ class UserSignScoreRepository extends BaseRepository
                         }, $updateUserScoreEntityList)
                     );
                 }
-            } catch (DbException $e) {
-
+            } catch (\Exception $e) {
+                throw new ValidateException('用户积分结算失败');
             }
         }
         return $idList;