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

app/common/dao/shared/SharedProsperityBalanceLogDao.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\common\dao\shared;
+
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\shared\SharedProsperityBalanceLog;
+
+class SharedProsperityBalanceLogDao extends BaseDao
+{
+    /**
+     * @return BaseModel
+     */
+    protected function getModel(): string
+    {
+        return SharedProsperityBalanceLog::class;
+    }
+}

app/common/dao/shared/SharedProsperityPointLogDao.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\common\dao\shared;
+
+use app\common\dao\BaseDao;
+use app\common\model\BaseModel;
+use app\common\model\shared\SharedProsperityPointLog;
+
+class SharedProsperityPointLogDao extends BaseDao
+{
+    /**
+     * @return BaseModel
+     */
+    protected function getModel(): string
+    {
+        return SharedProsperityPointLog::class;
+    }
+}

app/common/dao/shared/SharedProsperityRecommendConfigDao.php

@@ -20,7 +20,7 @@ class SharedProsperityRecommendConfigDao extends BaseDao
      * @date 2026/2/5 14:43
      * 获取推荐配置
      */
-    public function getConfigList(): array
+    public function getConfigList($idEntity = true): array
     {
         $entityList = [];
         try {
@@ -29,10 +29,12 @@ class SharedProsperityRecommendConfigDao extends BaseDao
             $dataRes = $model::getDB()
                 ->select()
                 ->toArray();
-            if (!empty($dataRes)) {
+            if (!empty($dataRes) && $idEntity) {
                 $entityList = array_map(function ($data) {
                     return SharedProsperityRecommendConfigEntity::newInstance($data);
                 }, $dataRes);
+            }else{
+                $entityList = $dataRes;
             }
         } catch (\Exception $e) {
         }

app/common/dao/shared/SharedProsperityRewardRecordDao.php

@@ -176,4 +176,25 @@ class SharedProsperityRewardRecordDao extends BaseDao
             return 0.0;
         }
     }
+
+    /**
+     * @param $start
+     * @param $end
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author 史晨
+     * @date 2026/2/10 13:56
+     * 时间范围搜索
+     */
+    public function getListByTime($start, $end)
+    {
+        $model = $this->getModel();
+        return $model::getDB()
+            ->where('take_time', '>', $start)
+            ->where('take_time', '<', $end)
+            ->select()
+            ->toArray();
+    }
 }

app/common/dao/shared/SharedProsperityUserDao.php

@@ -238,4 +238,49 @@ class SharedProsperityUserDao extends BaseDao
             return [];
         }
     }
+
+    /**
+     * 根据用户ID更新记录
+     * @param int $userId
+     * @param array $data
+     * @return int
+     */
+    public function updateByUserId(int $userId, array $data): int
+    {
+        try {
+            /** @var SharedProsperityUser $model */
+            $model = $this->getModel();
+            return $model::getDB()->where('user_id', $userId)->update($data);
+        } catch (\Exception $e) {
+            return 0;
+        }
+    }
+
+    /**
+     * 按合伙人等级分组获取用户
+     * @return array [partner_level => [user_id1, user_id2, ...]]
+     */
+    public function getUserGroupByPartnerLevel(): array
+    {
+        try {
+            /** @var SharedProsperityUser $model */
+            $model = $this->getModel();
+            $dataRes = $model::getDB()
+                ->field('partner_level, user_id')
+                ->select()
+                ->toArray();
+            
+            $grouped = [];
+            foreach ($dataRes as $row) {
+                $level = $row['partner_level'];
+                if (!isset($grouped[$level])) {
+                    $grouped[$level] = [];
+                }
+                $grouped[$level][] = $row['user_id'];
+            }
+            return $grouped;
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

app/common/dao/store/order/StoreOrderDao.php

@@ -756,4 +756,19 @@ class StoreOrderDao extends BaseDao
             return [];
         }
     }
+
+    public function shareProsperityOrder($merId, $start, $end)
+    {
+        /** @var StoreOrder $model */
+        $model = $this->getModel();
+        return  $model::getDB()
+            ->where('mer_id', $merId)
+            ->where('pay_time', '>', 0)
+            ->where('con_pri', '>', 0)
+            ->where('pay_time', '>', $start)
+            ->where('pay_time', '<', $end)
+            ->field('order_id,order_sn,pay_time,con_pri')
+            ->select()
+            ->toArray();
+    }
 }

app/common/enum/CommonEnum.php

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

app/common/model/shared/SharedProsperityBalanceLog.php

@@ -0,0 +1,17 @@
+<?php
+namespace app\common\model\shared;
+
+use app\common\model\BaseModel;
+
+class SharedProsperityBalanceLog extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'shared_prosperity_balance_log';
+    }
+}

app/common/model/shared/SharedProsperityPointLog.php

@@ -0,0 +1,17 @@
+<?php
+namespace app\common\model\shared;
+
+use app\common\model\BaseModel;
+
+class SharedProsperityPointLog extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'shared_prosperity_point_log';
+    }
+}

app/common/repositories/shared/SharedProsperityRewardRecordRepository.php

@@ -353,4 +353,20 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
             'small_department_contribution' => (float) $smallDepartmentContribution,
         ];
     }
+
+    /**
+     * @param $startTime
+     * @param $endTime
+     * @return array
+     * @throws DbException
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 史晨
+     * @date 2026/2/10 14:07
+     * 获取时间段内奖励列表
+     */
+    public function getListByTime($startTime, $endTime)
+    {
+        return $this->dao->getListByTime($startTime, $endTime);
+    }
 }

app/common/repositories/shared/SharedProsperityTaskRepository.php

@@ -0,0 +1,215 @@
+<?php
+
+namespace app\common\repositories\shared;
+
+use app\common\dao\shared\SharedProsperityBalanceLogDao;
+use app\common\dao\shared\SharedProsperityPointLogDao;
+use app\common\dao\shared\SharedProsperityRecommendConfigDao;
+use app\common\dao\shared\SharedProsperityUserDao;
+use app\common\enum\CommonEnum;
+use app\common\repositories\BaseRepository;
+use think\Collection;
+use think\facade\Db;
+use think\facade\Log;
+
+class SharedProsperityTaskRepository extends BaseRepository
+{
+    const PARTNER_RADIO = 1;
+
+    /**
+     * @param $data
+     * @return void
+     * @throws \Exception
+     * @author 史晨
+     * @date 2026/2/10 10:10
+     * 合伙人分红
+     */
+    public function partner($data)
+    {
+        // 获取时间范围内订单
+        $merId = CommonEnum::DESIGN_MERCHANT_ID['SharedProsperity']['code'];
+        $start = $data['startTime'];
+        $end = $data['endTime'];
+
+        // 获取pv
+        /** @var SharedProsperityRewardRecordRepository $rewardRecordRepository */
+        $rewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
+        $orderList = $rewardRecordRepository->getListByTime($start, $end);
+        if (empty($orderList)) {
+            throw new \Exception('没有订单');
+        }
+        // 计算可分配利润
+        $totalConPri = array_sum(array_column($orderList, 'number'));
+        $conPri = floor($totalConPri * self::PARTNER_RADIO * 100) / 100;
+
+        // 获取合伙人分配规则
+        /** @var SharedProsperityRecommendConfigDao $configDao */
+        $configDao = app()->make(SharedProsperityRecommendConfigDao::class);
+        $config = $configDao->getConfigList(false);
+        $config = array_column($config, 'profit_ratio', 'level');
+        if (empty($config)) {
+            throw new \Exception('没有合伙人分配规则');
+        }
+        // 获取合伙人
+        /** @var SharedProsperityUserDao $userDao */
+        $userDao = app()->make(SharedProsperityUserDao::class);
+        $users = $userDao->getUserGroupByPartnerLevel();
+
+        /** @var SharedProsperityBalanceLogDao $balanceDao */
+        $balanceDao = app()->make(SharedProsperityBalanceLogDao::class);
+
+        Db::startTrans();
+        try {
+            foreach ($users as $key => $user) {
+                if ($key == 0) {
+                    continue;
+                }
+                $radio = $config[$key];
+                $userNum = count($user);
+
+                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
+                    ]);
+
+                    $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]]);
+                }
+            }
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            throw new \Exception($e->getMessage());
+        }
+    }
+
+    /**
+     * @param $data
+     * @return true
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 史晨
+     * @date 2026/2/10 15:22
+     * 感恩奖
+     */
+    public function thank($data)
+    {
+        // 获取时间范围内订单
+        $start = $data['startTime'];
+        $end = $data['endTime'];
+
+        // 获取pv
+        /** @var SharedProsperityRewardRecordRepository $rewardRecordRepository */
+        $rewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
+        $rewardList = $rewardRecordRepository->getListByTime($start, $end);
+        if (empty($rewardList)) {
+            throw new \Exception('没有订单');
+        }
+
+        // user_id分区求和 [id]=>[number]
+        $groupedResult = array_reduce($rewardList, function ($carry, $item) {
+            $userId = $item['user_id'];
+            $number = floatval($item['number']);
+
+            if (!isset($carry[$userId])) {
+                $carry[$userId] = 0;
+            }
+
+            $carry[$userId] += $number;
+
+            return $carry;
+        }, []);
+
+        if (empty($groupedResult)) {
+            throw new \Exception('分组求和错误');
+        }
+
+        /** @var SharedProsperityUserRepository $userRepository */
+        $userRepository = app()->make(SharedProsperityUserRepository::class);
+
+        /** @var SharedProsperityPointLogDao $balanceDao */
+        $logDao = app()->make(SharedProsperityPointLogDao::class);
+
+        DB::startTrans();
+        try {
+            foreach ($groupedResult as $key => $value) {
+                // 获取感恩奖比例
+                $radio = CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Thank']['code'];
+                // 计算积分
+                $points = floor($value * $radio * 100) / 100;
+                // 获取上级
+                $userData = $userRepository->getSharedProsperityUserEntityByUserId($key);
+                $parentId = $userData->getParentId();
+                if ($parentId == 0) {
+                    Log::info('共富感恩奖发放：' . $key . '的上级是0，不发放感恩奖');
+                }
+                // 给上级发积分，记录日志
+                if ($parentId > 0) {
+                    $parentData = $userRepository->getSharedProsperityUserEntityByUserId($parentId);
+                    // 记录日志
+                    $logDao->create([
+                        'user_id' => $parentId,
+                        'total' => $value,
+                        'radio' => $radio,
+                        'old' => $parentData->getPoints(),
+                        'number' => $points,
+                        'after' => $parentData->getPoints() + $points
+                    ]);
+
+                    // 发放积分
+                    $userRepository->updateByUserId($parentId, ['points' => ['inc', $points]]);
+                }
+            }
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            DB::rollback();
+            throw new \Exception($e->getMessage());
+        }
+    }
+}

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -91,6 +91,15 @@ class SharedProsperityUserRepository extends BaseRepository
         }
     }
 
+    public function updateByUserId($userId,$data)
+    {
+        try {
+            return $this->dao->updateByUserId($userId, $data);
+        } catch (DbException $e) {
+            return 0;
+        }
+    }
+
     /**
      * @param SharedProsperityUserEntity $sharedProsperityUserEntity
      * @return SharedProsperityUserEntity

app/controller/api/shareProsperity/Task.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace app\controller\api\shareProsperity;
+use app\common\repositories\shared\SharedProsperityTaskRepository;
+
+class Task
+{
+    // 合伙人分红
+    public function partnerProfits()
+    {
+        $get = app()->request->get();
+        /** @var SharedProsperityTaskRepository $repository */
+        $repository = app()->make(SharedProsperityTaskRepository::class);
+        $repository->partner($get);
+        return app('json')->success();
+    }
+
+    public function thankProfits()
+    {
+        $get = app()->request->get();
+        /** @var SharedProsperityTaskRepository $repository */
+        $repository = app()->make(SharedProsperityTaskRepository::class);
+        $repository->thank($get);
+        return app('json')->success();
+    }
+}

app/entity/data/shared/SharedProsperityBalanceEntity.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace app\entity\data\shared;
+
+use app\entity\data\DataEntity;
+
+class SharedProsperityBalanceEntity extends DataEntity
+{
+    public $id = null;  // 主键
+    public $userId = null;  // 用户id
+    public $level = null;  // 用户等级
+    public $radio = null;  // 分配比例
+    public $total_profit = null; // 总佣金
+    public $old = null;  // 变更前佣金
+    public $number = null;  // 操作佣金
+    public $after = null;  // 变更后佣金
+    public $createTime = null;  // 创建时间
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setId($id): SharedProsperityBalanceEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    public function getUserId()
+    {
+        return $this->userId;
+    }
+
+    public function setUserId($userId): SharedProsperityBalanceEntity
+    {
+        $this->userId = $userId;
+        return $this;
+    }
+
+    public function getLevel()
+    {
+        return $this->level;
+    }
+
+    public function setLevel($level): SharedProsperityBalanceEntity
+    {
+        $this->level = $level;
+        return $this;
+    }
+
+    public function getRadio()
+    {
+        return $this->radio;
+    }
+
+    public function setRadio($radio): SharedProsperityBalanceEntity
+    {
+        $this->radio = $radio;
+        return $this;
+    }
+
+    public function getTotalProfit()
+    {
+        return $this->total_profit;
+    }
+
+    public function setTotalProfit($total_profit): SharedProsperityBalanceEntity
+    {
+        $this->total_profit = $total_profit;
+        return $this;
+    }
+
+    public function getOld()
+    {
+        return $this->old;
+    }
+
+    public function setOld($old): SharedProsperityBalanceEntity
+    {
+        $this->old = $old;
+        return $this;
+    }
+
+    public function getNumber()
+    {
+        return $this->number;
+    }
+
+    public function setNumber($number): SharedProsperityBalanceEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    public function getAfter()
+    {
+        return $this->after;
+    }
+
+    public function setAfter($after): SharedProsperityBalanceEntity
+    {
+        $this->after = $after;
+        return $this;
+    }
+
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    public function setCreateTime($createTime): SharedProsperityBalanceEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+}

app/entity/data/shared/SharedProsperityPointEntity.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace app\entity\data\shared;
+
+use app\entity\data\DataEntity;
+
+class SharedProsperityPointEntity extends DataEntity
+{
+    public $id = null;  // 主键
+    public $userId = null;  // 用户id
+    public $total = null;  // 总计
+    public $radio = null;  // 比例
+    public $old = null;  // 变更前佣金
+    public $number = null;  // 操作佣金
+    public $after = null;  // 变更后佣金
+    public $pm = null;  // 类型 1增加
+    public $createTime = null;  // 创建时间
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setId($id): SharedProsperityPointEntity
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    public function getUserId()
+    {
+        return $this->userId;
+    }
+
+    public function setUserId($userId): SharedProsperityPointEntity
+    {
+        $this->userId = $userId;
+        return $this;
+    }
+
+    public function getTotal()
+    {
+        return $this->total;
+    }
+
+    public function setTotal($total): SharedProsperityPointEntity
+    {
+        $this->total = $total;
+        return $this;
+    }
+
+    public function getRadio()
+    {
+        return $this->radio;
+    }
+
+    public function setRadio($radio): SharedProsperityPointEntity
+    {
+        $this->radio = $radio;
+        return $this;
+    }
+
+    public function getOld()
+    {
+        return $this->old;
+    }
+
+    public function setOld($old): SharedProsperityPointEntity
+    {
+        $this->old = $old;
+        return $this;
+    }
+
+    public function getNumber()
+    {
+        return $this->number;
+    }
+
+    public function setNumber($number): SharedProsperityPointEntity
+    {
+        $this->number = $number;
+        return $this;
+    }
+
+    public function getAfter()
+    {
+        return $this->after;
+    }
+
+    public function setAfter($after): SharedProsperityPointEntity
+    {
+        $this->after = $after;
+        return $this;
+    }
+
+    public function getPm()
+    {
+        return $this->pm;
+    }
+
+    public function setPm($pm): SharedProsperityPointEntity
+    {
+        $this->pm = $pm;
+        return $this;
+    }
+
+    public function getCreateTime()
+    {
+        return $this->createTime;
+    }
+
+    public function setCreateTime($createTime): SharedProsperityPointEntity
+    {
+        $this->createTime = $createTime;
+        return $this;
+    }
+
+}

app/entity/data/shared/SharedProsperityUserEntity.php

@@ -14,6 +14,7 @@ class SharedProsperityUserEntity extends DataEntity
     public $balance = null; // 余额
     public $withdrawalLimit = null;  // 提现额度
     public $partnerLevel = null;  // 合伙人等级
+    public $points = null;
     public $createTime = null;  // 创建时间
     public $updateTime = null;  // 更新时间
 
@@ -161,6 +162,17 @@ class SharedProsperityUserEntity extends DataEntity
         return $this;
     }
 
+    public function getPoints()
+    {
+        return $this->points;
+    }
+
+    public function setPoints($points): SharedProsperityUserEntity
+    {
+        $this->points = $points;
+        return $this;
+    }
+
     /**
      * @return mixed
      */

route/api.php

@@ -1378,3 +1378,8 @@ Route::group('/pages', function () {
     });
 })->middleware(\app\common\middleware\InstallMiddleware::class)
     ->middleware(\app\common\middleware\CheckSiteOpenMiddleware::class);
+
+// 共富分红
+Route::get('share_prosperity_partner', 'api.shareProsperity.Task/partnerProfits');
+// 共富感恩奖
+Route::get('share_prosperity_thank', 'api.shareProsperity.Task/thankProfits');