Merge branch 'dev-sc-260204' of shop/php into dev

app/common/dao/shared/SharedProsperityUserDao.php

@@ -3,6 +3,7 @@
 namespace app\common\dao\shared;
 
 use app\common\dao\BaseDao;
+use app\common\enum\CommonEnum;
 use app\common\model\BaseModel;
 use app\common\model\shared\SharedProsperityUser;
 use app\entity\data\shared\SharedProsperityUserEntity;
@@ -95,22 +96,27 @@ class SharedProsperityUserDao extends BaseDao
      * 递归获取团队所有下级用户ID（可选择是否包含自己）
      * @param int $userId
      * @param bool $includeSelf 是否包含自己
+     * @param int $hierarchy 层级限制，0表示不限制，>0表示限制层级
      * @return int[]
      */
-    public function getAllSubordinateUserIds(int $userId, bool $includeSelf = false): array
+    public function getAllSubordinateUserIds(int $userId, bool $includeSelf = false, int $hierarchy = CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Hierarchy']['code']): array
     {
         $allIds = [];
         try {
             /** @var SharedProsperityUser $model */
             $model = $this->getModel();
-            $getRecursiveChildren = function ($parentId) use (&$getRecursiveChildren, $model) {
+            $getRecursiveChildren = function ($parentId, $currentLevel = 1) use (&$getRecursiveChildren, $model, $hierarchy) {
+                // 如果设置了层级限制且当前层级超过限制，则停止递归
+                if ($hierarchy > 0 && $currentLevel > $hierarchy) {
+                    return [];
+                }
                 $children = $model::getDB()
                     ->where('parent_id', $parentId)
                     ->column('user_id');
                 $allChildren = [];
                 foreach ($children as $childId) {
                     $allChildren[] = $childId;
-                    $allChildren = array_merge($allChildren, $getRecursiveChildren($childId));
+                    $allChildren = array_merge($allChildren, $getRecursiveChildren($childId, $currentLevel + 1));
                 }
                 return $allChildren;
             };
@@ -171,86 +177,6 @@ class SharedProsperityUserDao extends BaseDao
     }
 
     /**
-     * 获取团队所有下级用户实体列表（不包括自己）
-     * @param int $userId
-     * @return SharedProsperityUserEntity[]
-     */
-    public function getTeamUserEntities(int $userId): array
-    {
-        $userIds = $this->getAllSubordinateUserIds($userId, false);
-        if (empty($userIds)) {
-            return [];
-        }
-        return $this->getSharedProsperityUserEntityListByUserIdList($userIds);
-    }
-
-    /**
-     * 获取团队所有下级用户实体列表（包括自己）
-     * @param int $userId
-     * @return SharedProsperityUserEntity[]
-     */
-    public function getTeamUserEntitiesWithSelf(int $userId): array
-    {
-        $userIds = $this->getAllSubordinateUserIds($userId, true);
-        if (empty($userIds)) {
-            return [];
-        }
-        return $this->getSharedProsperityUserEntityListByUserIdList($userIds);
-    }
-
-    /**
-     * 获取团队所有下级用户（包括分页，不包括自己）
-     * @param int $userId
-     * @param int $page
-     * @param int $pageSize
-     * @return array
-     */
-    public function getTeamUsers(int $userId, int $page = 1, int $pageSize = 10): array
-    {
-        $userIds = $this->getAllSubordinateUserIds($userId, false);
-        if (empty($userIds)) {
-            return ['data' => [], 'total' => 0, 'per_page' => $pageSize, 'current_page' => $page, 'last_page' => 1];
-        }
-        try {
-            /** @var SharedProsperityUser $model */
-            $model = $this->getModel();
-            $list = $model::getDB()
-                ->whereIn('user_id', $userIds)
-                ->paginate(['page' => $page, 'list_rows' => $pageSize])
-                ->toArray();
-            return $list;
-        } catch (\Exception $e) {
-            return ['data' => [], 'total' => 0, 'per_page' => $pageSize, 'current_page' => $page, 'last_page' => 1];
-        }
-    }
-
-    /**
-     * 获取团队所有下级用户（包括分页，包括自己）
-     * @param int $userId
-     * @param int $page
-     * @param int $pageSize
-     * @return array
-     */
-    public function getTeamUsersWithSelf(int $userId, int $page = 1, int $pageSize = 10): array
-    {
-        $userIds = $this->getAllSubordinateUserIds($userId, true);
-        if (empty($userIds)) {
-            return ['data' => [], 'total' => 0, 'per_page' => $pageSize, 'current_page' => $page, 'last_page' => 1];
-        }
-        try {
-            /** @var SharedProsperityUser $model */
-            $model = $this->getModel();
-            $list = $model::getDB()
-                ->whereIn('user_id', $userIds)
-                ->paginate(['page' => $page, 'list_rows' => $pageSize])
-                ->toArray();
-            return $list;
-        } catch (\Exception $e) {
-            return ['data' => [], 'total' => 0, 'per_page' => $pageSize, 'current_page' => $page, 'last_page' => 1];
-        }
-    }
-
-    /**
      * 批量更新
      * @param $dataList
      * @return array

app/common/enum/CommonEnum.php

@@ -277,7 +277,8 @@ class CommonEnum
                     'Ratio' => ['code' => 0.5, 'name' => '在共富区推广者获得购买商品赠送商品额50%的消费股']
                 ]
             ],
-            'Thank' => ['code' => 0.1, 'name' => '感恩奖分配比例，10%']
+            'Thank' => ['code' => 0.1, 'name' => '感恩奖分配比例，10%'],
+            'Hierarchy' => ['code' => 5, 'name' => '会员层级，5层'],
         ]
     ];
 

app/common/repositories/shared/SharedProsperityTaskRepository.php

@@ -24,7 +24,7 @@ class SharedProsperityTaskRepository extends BaseRepository
      * @throws \Exception
      * @author 史晨
      * @date 2026/2/10 10:10
-     * 合伙人分红
+     * 合伙人分红（加权分配）
      */
     public function partner($data)
     {
@@ -62,63 +62,43 @@ class SharedProsperityTaskRepository extends BaseRepository
 
         Db::startTrans();
         try {
-            foreach ($users as $key => $user) {
+            foreach ($users as $key => $userIds) {
                 if ($key == 0) {
                     continue;
                 }
                 $radio = $config[$key];
-                $userNum = count($user);
+                // 该等级总分红
+                $levelTotal = floor(($conPri * ($radio / 100)) * 100) / 100;
 
-                foreach ($user as $u) {
-                    // 计算每个用户分配的利润
-                    $userReward = floor(($conPri * ($radio / 100) / $userNum) * 100) / 100;
-                    // 记录日志
-                    $userData = $userDao->getWhere(['user_id' => $u])->toArray();
-                    $balanceDao->create([
-                        'user_id' => $u,
-                        'level' => $userData['partner_level'],
-                        'radio' => $radio,
-                        'total_profit' => $conPri,
-                        'old' => $userData['balance'],
-                        'number' => $userReward,
-                        'after' => $userData['balance'] + $userReward
-                    ]);
+                // 获取该等级所有用户的基本信息
+                $userInfos = $userDao->getSharedProsperityUserEntityListByUserIdList($userIds);
+                if (empty($userInfos)) {
+                    continue;
+                }
 
-                    $bill = [
-                        'uid' => $u,
-                        'link_id' => 0,//关联订单id
-                        'pm' => 1,//0：支出，1：获得
-                        'title' => '共富体系合伙人分佣',//账单标题
-                        'category' => 'now_money',//明细种类
-                        'type' => 'commission',//明细类型
-                        'number' => $userReward,//明细数字
-                        'balance' => 0,//剩余
-                        'mark' => '共富体系合伙人分佣明细入账',//备注
-                        'create_time' => date('Y-m-d H:i:s'),//添加时间
-                        'status' => 1,//0待确定，1有效，-1无效
-                        'commission_type' => CommonEnum::COMMISSION_TYPE['SHARED_PROSPERITY_PARTNER_COMMISSION']['code'],//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
-                        //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
-                        //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
-                        'order_sn' => 0,//订单号
-                        'tripartite' => 0,//
-                        'type_shop' => 0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
-                        'mer_id' => 0,//商户id
-                        'source' => 0,//1线下 0线上
-                        'order_type' => 1,//1自营  2 第三方  订单类型
-                        'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
-                        'gzc' => 3,//养老金是否已进入公证处log表0：未进入。1：已进入
-                        'take_time' => time(),//结算时间
-                        'district_id' => '',//
-                        'street_id' => '',//
-                        'month' => '',//月份
-
-
-                    ];
-
-                    Db::name('user_bill')->insert($bill);
-
-                    // 发放佣金
-                    $userDao->updateByUserId($u, ['balance' => ['inc', $userReward]]);
+                // 计算每个用户的团队业绩（实时统计）
+                $teamPvMap = [];
+                $totalTeamPv = 0;
+                foreach ($userInfos as $userInfo) {
+                    $teamPv = $userDao->getTeamPvSum($userInfo->getUserId());
+                    $teamPvMap[$userInfo->getUserId()] = $teamPv;
+                    $totalTeamPv += $teamPv;
+                }
+                // 如果总团队业绩为0，则平均分配
+                if ($totalTeamPv == 0) {
+                    $userNum = count($userInfos);
+                    $eachReward = floor(($levelTotal / $userNum) * 100) / 100;
+                    foreach ($userInfos as $userInfo) {
+                        $userReward = $eachReward;
+                        $this->distributeReward($userInfo, $userReward, $radio, $levelTotal, $balanceDao, $userDao);
+                    }
+                } else {
+                    // 加权分配
+                    foreach ($userInfos as $userInfo) {
+                        $weight = $teamPvMap[$userInfo->getUserId()] / $totalTeamPv;
+                        $userReward = floor($levelTotal * $weight * 100) / 100;
+                        $this->distributeReward($userInfo, $userReward, $radio, $levelTotal, $balanceDao, $userDao);
+                    }
                 }
             }
             Db::commit();
@@ -129,6 +109,60 @@ class SharedProsperityTaskRepository extends BaseRepository
     }
 
     /**
+     * 分发奖励（记录日志和更新余额）
+     * @param $userInfo
+     * @param $userReward
+     * @param $radio
+     * @param $levelTotal
+     * @param $balanceDao
+     * @param $userDao
+     * @return void
+     */
+    private function distributeReward($userInfo, $userReward, $radio, $levelTotal, $balanceDao, $userDao)
+    {
+        $userId = $userInfo->getUserId();
+        $balanceDao->create([
+            'user_id' => $userId,
+            'level' => $userInfo->getPartnerLevel(),
+            'radio' => $radio,
+            'total_profit' => $levelTotal,
+            'old' => $userInfo->getBalance(),
+            'number' => $userReward,
+            'after' => $userInfo->getBalance() + $userReward
+        ]);
+
+        $bill = [
+            'uid' => $userId,
+            'link_id' => 0,
+            'pm' => 1,
+            'title' => '共富体系合伙人分佣（加权）',
+            'category' => 'now_money',
+            'type' => 'commission',
+            'number' => $userReward,
+            'balance' => 0,
+            'mark' => '共富体系合伙人分佣明细入账（加权）',
+            'create_time' => date('Y-m-d H:i:s'),
+            'status' => 1,
+            'commission_type' => CommonEnum::COMMISSION_TYPE['SHARED_PROSPERITY_PARTNER_COMMISSION']['code'],
+            'order_sn' => 0,
+            'tripartite' => 0,
+            'type_shop' => 0,
+            'mer_id' => 0,
+            'source' => 0,
+            'order_type' => 1,
+            'is_red_brokerage' => 0,
+            'gzc' => 3,
+            'take_time' => time(),
+            'district_id' => '',
+            'street_id' => '',
+            'month' => '',
+        ];
+
+        Db::name('user_bill')->insert($bill);
+        $userDao->updateByUserId($userId, ['balance' => ['inc', $userReward]]);
+    }
+
+    /**
      * @param $data
      * @return true
      * @throws \think\db\exception\DataNotFoundException

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -4,6 +4,7 @@ namespace app\common\repositories\shared;
 
 use app\common\dao\shared\SharedProsperityUserDao;
 use app\common\dao\user\UserDao;
+use app\common\enum\CommonEnum;
 use app\common\repositories\BaseRepository;
 use app\entity\data\shared\SharedProsperityRecommendConfigEntity;
 use app\entity\data\shared\SharedProsperityUserEntity;