Merge branch 'dev-sc-260204'

app/common/dao/user/UserDao.php

@@ -501,4 +501,9 @@ class UserDao extends BaseDao
     {
         return $this->getModel()::getDB()->where('uid', '=', $uid)->inc('brokerage_price',$number)->update();
     }
+
+    public function updateWithdrawalLimitByUid($uid,$number)
+    {
+        return $this->getModel()::getDB()->where('uid', '=', $uid)->inc('withdrawal_limit',$number)->update();
+    }
 }

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -3,9 +3,11 @@
 namespace app\common\repositories\shared;
 
 use app\common\dao\shared\SharedProsperityGroupUserDao;
+use app\common\dao\shared\SharedProsperityRewardRecordDao;
 use app\common\dao\shared\SharedProsperityUserDao;
 use app\common\dao\shared\SharedProsperityUserLevelLogDao;
 use app\common\dao\user\UserDao;
+use app\common\dao\user\UserWithdrawalLimitRecordDao;
 use app\common\enum\CommonEnum;
 use app\common\enum\shared\SharedProsperityRewardRecordEnum;
 use app\common\enum\shared\SharedProsperityUserEnum;
@@ -812,79 +814,41 @@ class SharedProsperityUserRepository extends BaseRepository
      * @date 2026/2/27 15:16
      * 更新用户奖励
      */
-    public function updateReward($userId, $type, $number)
+    public function updateReward($userId, $type, $number, $remark)
     {
+        // 使用枚举常量代替硬编码数字
+        $typeConstants = SharedProsperityRewardRecordEnum::TYPE;
+        $CONSUMER_STOCKS_TYPE = $typeConstants['CONSUMER_STOCKS']['code'] ?? 1001;
+        $WITHDRAWAL_LIMIT_TYPE = $typeConstants['WITHDRAWAL_LIMIT']['code'] ?? 1002;
+        $PV_TYPE = $typeConstants['PV']['code'] ?? 1003;
+        
         $map = [
-            1001 => 'consumer_stocks',
-            1002 => 'withdrawal_limit',
-            1003 => 'pv'
+            $CONSUMER_STOCKS_TYPE => 'consumer_stocks',
+            $WITHDRAWAL_LIMIT_TYPE => 'withdrawal_limit',
+            $PV_TYPE => 'pv'
         ];
 
         try {
             Db::startTrans();
 
-            $pm = 1;
-            $remark = '后台操作增加' . $number;
-            if ($number < 0) {
-                $pm = 0;
-                $remark = '后台操作减少' . abs($number);
-            }
+            // 计算收支类型 (pm)
+            $pm = $number >= 0 ? 1 : 0;
+            $absNumber = abs($number);
+            $currentTime = date('Y-m-d H:i:s');
 
             if (isset($map[$type])) {
-                // 更新数据
-                $this->dao->updateRewardByUserId($userId, $map[$type], $number);
-                // 记录日志
-                $insertData = [
-                    'user_id' => $userId,
-                    'type' => $type,
-                    'pm' => $pm,
-                    'number' => abs($number),
-                    'balance' => 0,
-                    'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'],
-                    'type_shop' => SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'],
-                    'order_sn' => 0,
-                    'take_time' => date('Y-m-d H:i:s', time()),
-                    'remark' => $remark,
-                    'create_time' => date('Y-m-d H:i:s', time()),
-                    'update_time' => date('Y-m-d H:i:s', time()),
-                ];
-                /** @var SharedProsperityRewardRecordDao $rewardRecordDao */
-                $rewardRecordDao = app()->make(SharedProsperityRewardRecordDao::class);
-                $rewardRecordDao->insertAll([$insertData]);
+                if ($type == $WITHDRAWAL_LIMIT_TYPE) {
+                    // 处理提现额度
+                    $this->handleWithdrawalLimit($userId, $number, $pm, $absNumber, $remark);
+                } else {
+                    // 处理消费股或PV值
+                    $this->handleSharedProsperityReward($userId, $type, $map[$type], $number, $pm, $absNumber, $remark, $currentTime);
+                }
             } else {
-                // 更新数据
-                /** @var UserDao $userDao */
-                $userDao = app()->make(UserDao::class);
-                $userDao->updateBrokeragePriceByUid($userId, $number);;
-                // 记录日志
-                $bill = [
-                    'uid' => $userId,
-                    'link_id' => 0,
-                    'pm' => $pm,
-                    'title' => $remark,
-                    'category' => 'now_money',
-                    'type' => 'commission',
-                    'number' => abs($number),
-                    'balance' => 0,
-                    'mark' => $remark,
-                    '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);
+                // 处理佣金
+                $this->handleBrokerage($userId, $number, $pm, $absNumber, $remark, $currentTime);
             }
+            
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -894,6 +858,152 @@ class SharedProsperityUserRepository extends BaseRepository
     }
 
     /**
+     * 处理提现额度更新
+     * @param int $userId 用户ID
+     * @param float $number 变动金额
+     * @param int $pm 收支类型 (1:收入, 0:支出)
+     * @param float $absNumber 变动金额绝对值
+     * @param string $remark 备注
+     * @return void
+     */
+    private function handleWithdrawalLimit($userId, $number, $pm, $absNumber, $remark)
+    {
+        /** @var UserDao $userDao */
+        $userDao = app()->make(UserDao::class);
+        
+        // 更新提现额度
+        $userDao->updateWithdrawalLimitByUid($userId, $number);
+        
+        // 获取更新后的余额
+        $userData = $userDao->getWhere(['uid' => $userId]);
+        $balance = $userData->withdrawal_limit;
+        
+        // 记录日志
+        $insertData = [
+            'user_id' => $userId,
+            'pm' => $pm,
+            'number' => $absNumber,
+            'balance' => $balance,
+            'status' => 1,
+            'type_shop' => 0,
+            'take_time' => date('Y-m-d H:i:s'),
+            'remark' => $remark
+        ];
+        
+        /** @var UserWithdrawalLimitRecordDao $withdrawalRecordDao */
+        $withdrawalRecordDao = app()->make(UserWithdrawalLimitRecordDao::class);
+        $withdrawalRecordDao->create($insertData);
+    }
+
+    /**
+     * 处理共富体系奖励（消费股/PV值）
+     * @param int $userId 用户ID
+     * @param int $type 奖励类型
+     * @param string $field 数据库字段名
+     * @param float $number 变动金额
+     * @param int $pm 收支类型 (1:收入, 0:支出)
+     * @param float $absNumber 变动金额绝对值
+     * @param string $remark 备注
+     * @param string $currentTime 当前时间
+     * @return void
+     */
+    private function handleSharedProsperityReward($userId, $type, $field, $number, $pm, $absNumber, $remark, $currentTime)
+    {
+        // 使用枚举常量
+        $typeConstants = SharedProsperityRewardRecordEnum::TYPE;
+        $CONSUMER_STOCKS_TYPE = $typeConstants['CONSUMER_STOCKS']['code'] ?? 1001;
+        $PV_TYPE = $typeConstants['PV']['code'] ?? 1003;
+        
+        // 更新数据
+        $this->dao->updateRewardByUserId($userId, $field, $number);
+        
+        // 获取更新后的余额
+        $userData = $this->dao->getWhere(['user_id' => $userId]);
+        
+        // 根据类型确定余额字段
+        if ($type == $CONSUMER_STOCKS_TYPE) {
+            $balance = $userData->consumer_stocks;
+        } elseif ($type == $PV_TYPE) {
+            $balance = $userData->pv;
+        } else {
+            $balance = 0;
+        }
+        
+        // 记录日志
+        $insertData = [
+            'user_id' => $userId,
+            'type' => $type,
+            'pm' => $pm,
+            'number' => $absNumber,
+            'balance' => $balance,
+            'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'],
+            'type_shop' => SharedProsperityRewardRecordEnum::TYPE_SHOP['Platform']['code'],
+            'order_sn' => 0,
+            'take_time' => $currentTime,
+            'remark' => $remark,
+            'create_time' => $currentTime,
+            'update_time' => $currentTime,
+        ];
+        
+        /** @var SharedProsperityRewardRecordDao $rewardRecordDao */
+        $rewardRecordDao = app()->make(SharedProsperityRewardRecordDao::class);
+        $rewardRecordDao->insertAll([$insertData]);
+    }
+
+    /**
+     * 处理佣金更新
+     * @param int $userId 用户ID
+     * @param float $number 变动金额
+     * @param int $pm 收支类型 (1:收入, 0:支出)
+     * @param float $absNumber 变动金额绝对值
+     * @param string $remark 备注
+     * @param string $currentTime 当前时间
+     * @return void
+     */
+    private function handleBrokerage($userId, $number, $pm, $absNumber, $remark, $currentTime)
+    {
+        /** @var UserDao $userDao */
+        $userDao = app()->make(UserDao::class);
+        
+        // 更新佣金
+        $userDao->updateBrokeragePriceByUid($userId, $number);
+        
+        // 获取更新后的余额
+        $userData = $userDao->getWhere(['uid' => $userId]);
+        $balance = $userData->brokerage_price;
+        
+        // 记录账单
+        $bill = [
+            'uid' => $userId,
+            'link_id' => 0,
+            'pm' => $pm,
+            'title' => $remark,
+            'category' => 'now_money',
+            'type' => 'commission',
+            'number' => $absNumber,
+            'balance' => $balance,
+            'mark' => $remark,
+            'create_time' => $currentTime,
+            '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);
+    }
+
+    /**
      * 第一次促销的 身份 升级方法
      * @param SharedProsperityUserEntity $sharedProsperityUserEntity
      * @return void

app/controller/admin/system/sharedProsperity/SharedProsperityUser.php

@@ -51,8 +51,11 @@ class SharedProsperityUser
     {
         /** @var SharedProsperityUserRepository $repository */
         $repository = app()->make(SharedProsperityUserRepository::class);
-        $params = app('request')->params(['user_id', 'type', 'number']);
-        $res = $repository->updateReward($params['user_id'], $params['type'], $params['number']);
+        $params = app('request')->params(['user_id', 'type', 'number', 'remark']);
+        if (empty($params['user_id']) || empty($params['type']) || empty($params['number'] || empty($params['remark']))) {
+            return app('json')->fail('参数错误');
+        }
+        $res = $repository->updateReward($params['user_id'], $params['type'], $params['number'], $params['remark']);
         if (!$res) {
             return app('json')->fail('更新失败');
         }