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

app/common/dao/user/UserBillDao.php

@@ -339,4 +339,45 @@ class UserBillDao extends BaseDao
             return 0;
         }
     }
+
+    /**
+     * @param $params
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author 史晨
+     * @date 2026/2/11 14:45
+     * 获取数据列表
+     */
+    public function getListData($params)
+    {
+        $query = $this::getModel()::getDB();
+        if (isset($params['start']) && $params['start'] != '') {
+            if (!is_numeric($params['start'])) {
+                $params['start'] = strtotime($params['start']);
+            }
+            $query->where('take_time', '>=', $params['start']);
+        }
+        if (isset($params['end']) && $params['end'] != '') {
+            if (!is_numeric($params['end'])) {
+                $params['end'] = strtotime($params['end']);
+            }
+            $query->where('take_time', '<=', $params['end']);
+        }
+
+        if (isset($params['status']) && $params['status'] != '') {
+            $query->where('status', '=', $params['status']);
+        }
+
+        if (isset($params['merId']) && $params['merId'] != '') {
+            $query->whereIn('mer_id', $params['merId']);
+        }
+
+        if (isset($params['commissionType']) && $params['commissionType'] != '') {
+            $query->whereIn('commission_type', $params['commissionType']);
+        }
+
+        return $query->select()->toArray();
+    }
 }

app/common/repositories/shared/SharedProsperityTaskRepository.php

@@ -9,6 +9,7 @@ use app\common\dao\shared\SharedProsperityUserDao;
 use app\common\enum\CommonEnum;
 use app\common\enum\shared\SharedProsperityRewardRecordEnum;
 use app\common\repositories\BaseRepository;
+use app\common\repositories\user\UserBillRepository;
 use think\facade\Db;
 use think\facade\Log;
 
@@ -178,17 +179,23 @@ class SharedProsperityTaskRepository extends BaseRepository
         $start = $data['startTime'];
         $end = $data['endTime'];
 
-        // 获取pv
-        /** @var SharedProsperityRewardRecordRepository $rewardRecordRepository */
-        $rewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
-        $rewardList = $rewardRecordRepository->getListByTime($start, $end, self::REWARD_TYPE_PV);
-        if (empty($rewardList)) {
-            throw new \Exception('没有订单');
+        // 获取收入
+        /** @var UserBillRepository $userBillRepository */
+        $userBillRepository = app()->make(UserBillRepository::class);
+        $billList = $userBillRepository->getListForSharedProsperityThank($start, $end);
+        if (empty($billList)) {
+            throw new \Exception('没有佣金记录，无需处理');
         }
+        // /** @var SharedProsperityRewardRecordRepository $rewardRecordRepository */
+        // $rewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
+        // $rewardList = $rewardRecordRepository->getListByTime($start, $end, self::REWARD_TYPE_PV);
+        // if (empty($rewardList)) {
+        //     throw new \Exception('没有订单');
+        // }
 
         // user_id分区求和 [id]=>[number]
-        $groupedResult = array_reduce($rewardList, function ($carry, $item) {
-            $userId = $item['user_id'];
+        $groupedResult = array_reduce($billList, function ($carry, $item) {
+            $userId = $item['uid'];
             $number = floatval($item['number']);
 
             if (!isset($carry[$userId])) {
@@ -219,12 +226,21 @@ class SharedProsperityTaskRepository extends BaseRepository
                 $points = floor($value * $radio * 100) / 100;
                 // 获取上级
                 $userData = $userRepository->getSharedProsperityUserEntityByUserId($key);
+                if (empty($userData->getUserId())) {
+                    Log::info('共富感恩奖发放：' . $key . '不是共富会员，不发放感恩奖');
+                    continue;
+                }
                 $parentId = $userData->getParentId();
                 if ($parentId == 0) {
                     Log::info('共富感恩奖发放：' . $key . '的上级是0，不发放感恩奖');
+                    continue;
                 }
                 // 给上级发积分，记录日志
                 if ($parentId > 0) {
+                    if ($points <= 0) {
+                        Log::info('共富感恩奖发放：' . $key . '的收入是' . $value . '，奖励占比是' . $radio . '，积分是' . $value * $radio . '所以' . $parentId . '发放感恩奖');
+                        continue;
+                    }
                     $parentData = $userRepository->getSharedProsperityUserEntityByUserId($parentId);
                     // 记录日志
                     $logDao->create([

app/common/repositories/user/UserBillRepository.php

@@ -13,6 +13,7 @@ namespace app\common\repositories\user;
 
 use app\common\dao\BaseDao;
 use app\common\dao\user\UserBillDao;
+use app\common\enum\CommonEnum;
 use app\common\enum\user\UserBillEnum;
 use app\common\enum\user\UserCertificationEnum;
 use app\common\model\user\UserBill;
@@ -656,4 +657,34 @@ class UserBillRepository extends BaseRepository
 
         return $idList;
     }
+
+    /**
+     * @param $start
+     * @param $end
+     * @return array
+     * @author 史晨
+     * @date 2026/2/11 14:29
+     * 共富感恩奖佣金查询
+     */
+    public function getListForSharedProsperityThank($start, $end)
+    {
+        $status = UserBillEnum::STATUS['VALID']['code'];
+        $merId = [
+            CommonEnum::DESIGN_MERCHANT_ID['WonderfulLiving']['code'],
+            CommonEnum::DESIGN_MERCHANT_ID['Repurchase']['code'],
+            CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code'],
+        ];
+        $commission_type = [
+            CommonEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
+            CommonEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code']
+        ];
+        $params = [
+            'start' => $start,
+            'end' => $end,
+            'status' => $status,
+            'merId' => $merId,
+            'commissionType' => $commission_type
+        ];
+        return $this->dao->getListData($params);
+    }
 }