```

feat(profits): 添加执行分红功能- 在 `route/admin.php` 中添加了执行分红的路由。- 新增 `ExecuteProfitRequestEntity` 请求实体类，用于处理执行分红请求的数据。- 新增 `ExecuteProfitValidate` 验证器，用于验证执行分红请求的数据。
- 新增 `OldUserLog` 模型类，用于记录用户余额日志。
- 新增 `OldUserLogDao` 数据访问对象，用于操作 `OldUserLog` 模型。
- 新增 `OldUserLogEnum` 枚举类，定义了金额类型。
- 在 `ProfitsRepository` 中新增 `executeProfit` 方法，用于执行分红逻辑，并记录用户余额日志。
- 在 `ShareProfits` 控制器中新增 `executeProfit` 方法，用于处理执行分红的请求。
-修复了 `Pv` 类中的代码格式问题。- 修改了队列配置，默认使用 Redis作为队列驱动。
```

app/common/dao/log/OldUserLogDao.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\common\dao\log;
+
+use app\common\dao\BaseDao;
+use app\common\model\log\OldUserLog;
+
+class OldUserLogDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return OldUserLog::class;
+    }
+}

app/common/enum/log/OldUserLogEnum.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace app\common\enum\log;
+
+use app\common\enum\CommonEnum;
+
+class OldUserLogEnum extends CommonEnum
+{
+    // 金额类型:1=PV,2=GB(钢镚),3=冻积分(DF),4代金券(VR),5补贴金(BT),6=提现额度,7=养老金,8,佣金
+    const TYPE = [
+        'PV' => ['code' => 1, 'name' => 'PV'],
+        'GB' => ['code' => 2, 'name' => 'GB(钢镚)'],
+        'DF' => ['code' => 3, 'name' => '冻积分(DF)'],
+        'VR' => ['code' => 4, 'name' => '代金券(VR)'],
+        'BT' => ['code' => 5, 'name' => '补贴金(BT)'],
+        'TX' => ['code' => 6, 'name' => '提现额度'],
+        'YL' => ['code' => 7, 'name' => '养老金'],
+        'YJ' => ['code' => 8, 'name' => '佣金']
+    ];
+}

app/common/model/log/OldUserLog.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace app\common\model\log;
+
+use app\common\model\BaseModel;
+
+/**
+ * 用户余额记录表
+ */
+class OldUserLog extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'old_user_log';
+    }
+}

app/common/repositories/profits/ProfitsRepository.php

@@ -7,7 +7,9 @@ use app\common\dao\profit\ZeroUserProfitDao;
 use app\common\dao\user\UserDao;
 use app\common\dao\user\ZeroUserLineDao;
 use app\common\enum\user\ZeroUserEnum;
+use app\common\model\log\OldUserLog;
 use app\common\model\profit\ZeroUserProfitsDetail;
+use app\common\model\user\User;
 use app\common\utils\QueueLogger;
 use app\jobs\ZeroUserProfits;
 use think\db\exception\DataNotFoundException;
@@ -142,7 +144,7 @@ class ProfitsRepository
                 unset($groupData);
                 $groupData = $this->getUserByGroup($userIds, $key);
                 if (empty($groupData)) {
-                    QueueLogger::info('0号线合伙人分红：0号线用户：'.$param['zeroUserId'].',暂无'.$key.'级别用户' );
+                    QueueLogger::info('0号线合伙人分红：0号线用户：' . $param['zeroUserId'] . ',暂无' . $key . '级别用户');
                     continue;
                 }
                 // 获取初中高用户直推和团队业绩
@@ -363,4 +365,141 @@ class ProfitsRepository
         }
         return true;
     }
+
+    // 执行分红
+    public function executeProfit($param)
+    {
+        $detailDao = new ZeroUserProfitsDetail();
+        // 获取分红信息
+        $list = $detailDao->where('zero_user_profit_id', $param['zeroUserProfitId'])->select()->toArray();
+        if (empty($list)) {
+            return [];
+        }
+
+
+        // $userIds = array_column($list, 'user_id');
+        //
+        // $userList = User::select($userIds);
+
+
+        // dd($list);
+
+        foreach ($list as $key => $value) {
+
+            $allAward = bcadd($value['min_count'], $value['max_count']);
+            //90%给佣金，10给复购金
+            $yj_90 = floor($allAward * 0.9 * 100) / 100;
+            $fg_10 = floor($allAward * 0.1 * 100) / 100;
+
+            $userModel = $this->userDao->get($value['user_id']);
+            $userModel->total_amount_old = $userModel->total_amount_old + $yj_90;
+            $userModel->amount_old = $userModel->amount_old + $yj_90;
+            $userModel->brokerage_price = $userModel->brokerage_price + $yj_90;
+            $userModel->fugou = $userModel->fugou + $fg_10;
+            $userModel->save();
+        }
+
+
+        die;
+
+        // 插入执行分红队列
+        // foreach ($userList as $value) {
+        //     $value->amount_old = Db::raw('amount_old + 1');
+        //     $value->save();
+        // }
+
+        $update = [];
+        foreach ($userList as $value) {
+            $amountOld = $value->amount_old + 1;
+            $update[] = [
+                'uid' => $value->uid,
+                'amount_old' => $amountOld
+            ];
+        }
+        $this->userDao->saveAll($update);
+        die;
+    }
+
+    /**
+     * @param $userId
+     * @param $type
+     * @param $changeStatus
+     * @param $money
+     * @param $routineLogOfKeyId
+     * @param $remark
+     * @param $isAdmin
+     * @param $createTime
+     * @param $alterMoney
+     * @return int|string
+     * @author 史晨
+     * @date 2025/9/18 14:16
+     * 记录用户余额日志
+     */
+    private function recordOldUserLog($userId, $type, $changeStatus, $money, $routineLogOfKeyId, $remark = "", $isAdmin = 1, $alterMoney = 0)
+    {
+        $insertData = [
+            'user_id' => $userId,
+            'type' => $type,
+            'change_status' => $changeStatus,
+            'money' => $money,
+            'routine_log_of_key_id' => $routineLogOfKeyId,
+            'remark' => $remark,
+            'is_admin' => $isAdmin,
+            'create_time' => time(),
+            'alter_money' => $alterMoney
+        ];
+        $dao = new OldUserLog();
+        return $dao->insert($insertData);
+    }
+
+    private function recordUserBillLog()
+    {
+        $bill = [
+            'uid' => $uid,
+            'link_id' => 0,//关联订单id
+            'pm' => 1,//0：支出，1：获得
+            'title' => $name,//账单标题
+            'category' => 'now_money',//明细种类
+            'type' => 'commission',//明细类型
+            'number' => $num,//明细数字
+            'balance' => 0,//剩余
+            'mark' => $mark,//备注
+            'create_time' => date('Y-m-d H:i:s'),//添加时间
+            'status' => 1,//0待确定，1有效，-1无效
+            'commission_type' => $comm,//佣金类型 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' => '',//月份
+
+
+        ];
+    }
+
+    private function fugouUserLog()
+    {
+        $bill = [
+            'uid' => $uid,
+            'number' => $num,//数量
+            'status' => $status,//复购金状态1-有效 0-失效 -1待确认
+            'mark' => "复购金",//备注
+            'desc' => "10%复购金",//描述
+            'order_id' => $order_id,//订单id
+            'surplus' => 0,//剩余
+            'order_type' => 11,//关联订单ID
+            'type' => $type_inc_des,//复购金类型 :1赠送，2消耗
+            'settlement_time' => date('Y-m-d H:i:s'),//添加时间,
+            'addtime' => time(),
+        ];
+    }
 }

app/common/utils/Pv.php

@@ -32,7 +32,7 @@ class Pv
         StoreOrderEnum::STATUS['WAITING_RECEIVE']['code'],
         StoreOrderEnum::STATUS['WAITING_EVALUATION']['code'],
         StoreOrderEnum::STATUS['COMPLETED']['code']
-        ];
+    ];
 
     /**
      * 需要排除的测试用户ID列表
@@ -84,7 +84,7 @@ class Pv
      */
     public function getPvConfig(): array
     {
-        return  $this->pvDao->getData();
+        return $this->pvDao->getData();
     }
 
     /**

app/controller/admin/profits/ShareProfits.php

@@ -5,8 +5,10 @@ namespace app\controller\admin\profits;
 use app\common\repositories\profits\ProfitsRepository;
 use app\common\utils\Pv;
 use app\controller\admin\BaseController;
+use app\entity\admin\request\profits\ExecuteProfitRequestEntity;
 use app\entity\admin\request\profits\PartnerProfitsRequestEntity;
 use app\entity\admin\response\profits\ZeroUserProfitResponseEntity;
+use app\validate\admin\profits\ExecuteProfitValidate;
 use app\validate\admin\profits\PartnerProfitsValidate;
 
 class ShareProfits extends BaseController
@@ -33,15 +35,9 @@ class ShareProfits extends BaseController
      */
     public function partnerProfits(PartnerProfitsValidate $validate)
     {
-
-        $a = new Pv();
-        $a->countPv();
-        die;
-
-
         $validationResult = $this->validateRequest($validate, PartnerProfitsRequestEntity::class);
-        $res = $this->repository->getZeroUser($validationResult->toArray());
-        // $res = $this->repository->profits($validationResult->toArray());
+        // $res = $this->repository->getZeroUser($validationResult->toArray());
+        $res = $this->repository->profits($validationResult->toArray());
         if (is_string($res)) {
             $response = ZeroUserProfitResponseEntity::error($res);
             return app('json')->fail($response->toResponseArray());
@@ -49,4 +45,11 @@ class ShareProfits extends BaseController
         $response = ZeroUserProfitResponseEntity::success();
         return app('json')->success($response->toResponseArray());
     }
+
+    // 执行分红
+    public function executeProfit(ExecuteProfitValidate $validate)
+    {
+        $validationResult = $this->validateRequest($validate, ExecuteProfitRequestEntity::class);
+        $this->repository->executeProfit($validationResult->toArray());
+    }
 }

app/entity/admin/request/profits/ExecuteProfitRequestEntity.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace app\entity\admin\request\profits;
+
+use app\entity\CommonEntity;
+
+class ExecuteProfitRequestEntity extends CommonEntity
+{
+    // 0号线分红日志id
+    public $zeroUserProfitId;
+
+
+    public function getZeroUserProfitId()
+    {
+        return $this->zeroUserProfitId;
+    }
+
+
+    public function setZeroUserProfitId($zeroUserProfitId): ExecuteProfitRequestEntity
+    {
+
+        $this->zeroUserProfitId = $zeroUserProfitId;
+        return $this;
+    }
+}

app/validate/admin/profits/ExecuteProfitValidate.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\validate\admin\profits;
+
+use app\validate\CommonValidate;
+
+class ExecuteProfitValidate extends CommonValidate
+{
+    protected $failException = true;
+
+    protected $rule = [
+        'zero_user_profit_id|日志id' => 'require',
+    ];
+
+    protected $message = [
+        'zero_user_profit_id.int' => '日志id类型错误',
+    ];
+}

config/queue.php

@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 return [
-    'default'     => 'database',
+    'default'     => 'redis',
     'connections' => [
         'sync'     => [
             'type' => 'sync',

route/admin.php

@@ -481,6 +481,8 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
         Route::group('shareProfits', function () {
             // 合伙人分红
             Route::post('partnerProfits', '/partnerProfits')->name('partnerProfits');
+            // 执行分红
+            Route::post('executeProfit', '/executeProfit')->name('executeProfit');
         })->prefix('admin.profits.ShareProfits');