This commit is contained in:
2025-10-11 14:49:25 +08:00
parent ac9182c566
commit 7415193bba
5 changed files with 68 additions and 127 deletions

View File

@@ -4,6 +4,7 @@ namespace app\api\controller;
use app\common\controller\BaseCom;
use app\common\service\RedpacketService;
use think\Db;
/**
* 红包接口
@@ -32,14 +33,13 @@ class Redpacket extends BaseCom
public function grab()
{
$redpacketId = $this->request->post('redpacket_id');
$password = $this->request->post('password', '');
if (empty($redpacketId)) {
return V(0, '红包ID不能为空');
}
$service = new RedpacketService();
$reslut = $service->grabWithResult($redpacketId, $this->uid, $password);
$reslut = $service->grabWithResult($redpacketId, $this->uid);
return V($reslut['code'], $reslut['msg'], $reslut['data']);
}
@@ -49,21 +49,20 @@ class Redpacket extends BaseCom
*/
public function grabResult()
{
$user = $this->auth->getUser();
$redpacketId = $this->request->get('redpacket_id');
if (empty($redpacketId)) {
$this->error('红包ID不能为空');
return V(0, '红包ID不能为空');
}
$service = new RedpacketService();
$result = $service->getGrabResult($redpacketId, $user->id);
$result = $service->getGrabResult($redpacketId, $this->uid);
if (!$result) {
$this->error('红包不存在');
return V(0, '红包不存在');
}
$this->success('获取成功', $result);
return V(1, '获取成功', $result);
}
/**
@@ -72,25 +71,19 @@ class Redpacket extends BaseCom
public function detail()
{
$redpacketId = $this->request->get('redpacket_id');
$currentUserId = $this->auth->isLogin() ? $this->auth->id : 0;
if (empty($redpacketId)) {
$this->error('红包ID不能为空');
return V(0, '红包ID不能为空');
}
try {
$service = new RedpacketService();
$detail = $service->getDetail($redpacketId, $currentUserId);
$detail = $service->getDetail($redpacketId, $this->uid);
if (!$detail) {
$this->error('红包不存在');
return V(0, '红包不存在');
}
$this->success('获取成功', $detail);
} catch (\Exception $e) {
$this->error($e->getMessage());
}
return V(1, '获取成功', $detail);
}
/**
@@ -101,4 +94,12 @@ class Redpacket extends BaseCom
$options = \app\common\model\Redpacket::$countdownOptions;
$this->success('获取成功', $options);
}
// 获取房间内红包列表
public function roomRedPackets()
{
$roomId = $this->request->get('room_id');
$result = Db::name('redpacket')->where(['room_id' => $roomId, 'status' => [1, 0]])->select();
return V(1, '获取成功', $result);
}
}

View File

@@ -50,18 +50,18 @@ class UserWallet extends Model
// 1.系统调节 2.充值 3.提现 4.金币转增(送出) 5.每日任务奖励 6.充值返利 7.购买装扮
// 8.礼盒奖励 9.房间补贴 10.购买礼物 11.收礼增加收益 12.工会补贴 13.转赠金币(接收) 14.收益兑换
// 15.首充 16.天降好礼充值 17.退出工会扣款 18.房主收益 19.主持人收益20.发布头条扣除余额,21.公会长收益,22.提现驳回或提现失败返还,23.财富等级奖励金币领取,24.删除关系扣金币
//27.小时榜获得
//27.小时榜获得28-发红包金币29-发红包钻石30-抢红包金币31-抢红包(钻石)
if($gift_type == 1){ //1金币2收益钻石
if($in_out_type == 1){//1收入
$in_out_types = [2,5,6,8,13,14,15,16,22,23,26,27];
$in_out_types = [2,5,6,8,13,14,15,16,22,23,26,27,30];
}elseif($in_out_type == 2){//2支出
$in_out_types = [4,7,10,17,20,24,25];
$in_out_types = [4,7,10,17,20,24,25,28];
}
}elseif($gift_type == 2){ //1金币2收益钻石
if($in_out_type == 1){//1收入
$in_out_types = [6,9,11,12,18,19,21,22];
$in_out_types = [6,9,11,12,18,19,21,22,31];
}elseif($in_out_type == 2){//2支出
$in_out_types = [3,14];
$in_out_types = [3,14,29];
}
}

View File

@@ -55,11 +55,27 @@ class Redpacket extends Model
}
// 扣除余额
Db::name('user_wallet')
$delres = Db::name('user_wallet')
->where('user_id', $data['user_id'])
->dec($coinField, $data['total_amount'])
->update();
//记录日志 32-发红包金币29-发红包钻石30-抢红包金币31-抢红包(钻石)
//记录用户金币日志
$data = [
'user_id' => $data['user_id'],
'change_value' => $data['total_amount'],
'room_id' => $data['room_id'],
'money_type' => $data['coin_type'],
'change_type' => $coinField == self::COIN_GOLD ? 32 : 29,
'from_id' => $data['room_id'],
'remarks' => $coinField == self::COIN_GOLD ? '金币(发红包)' : '钻石(发红包)',
'createtime' => time()
];
$res = Db::name('vs_user_money_log')->insert($data);
if(!$res || !$delres){
Db::rollback();
}
// 计算开始时间
$startTime = $data['countdown'] > 0 ? (time() + $data['countdown']) : time();
$endTime = $startTime + 120; // 2分钟后结束

View File

@@ -78,6 +78,14 @@ class UserWallet extends Model
//新人充值好礼
const NEW_USER_CHARGE_GIFT = 28;
//发红包(金币)
const RED_PACKET_COIN = 32;
//发红包(钻石)
const RED_PACKET_DIAMOND = 29;
//抢红包(金币)
const RED_PACKET_COIN_RECEIVE = 30;
//抢红包(钻石)
const RED_PACKET_DIAMOND_RECEIVE = 31;
//金币支出类型数组
public $coin_consumption_type_array = [
@@ -86,12 +94,14 @@ class UserWallet extends Model
self::OPERATION_GIFT,
self::GUILD_EXIT,
self::HEADLINE_REWARD,
self::TRANSFER_COIN
self::TRANSFER_COIN,
self::RED_PACKET_COIN,
];
//钻石支出类型数组
public $diamond_consumption_type_array = [
self::OPERATION_WITHDRAW,
self::MONEY_CONVERSION
self::MONEY_CONVERSION,
self::RED_PACKET_DIAMOND
];
@@ -141,7 +151,11 @@ class UserWallet extends Model
self::TRANSFER_COIN => '赠送好友金币',
self::RECEIVE_COIN => '好友转赠所得金币',
self::HOUR_RANK_COIN => '小时榜获得金币',
self::NEW_USER_CHARGE_GIFT => '新人充值好礼'
self::NEW_USER_CHARGE_GIFT => '新人充值好礼',
self::RED_PACKET_COIN => '发红包(金币)',
self::RED_PACKET_DIAMOND => '发红包(钻石)',
self::RED_PACKET_COIN_RECEIVE => '抢红包(金币)',
self::RED_PACKET_DIAMOND_RECEIVE => '抢红包(钻石)',
];
return $status[$type] ?? '';
}

View File

@@ -30,7 +30,7 @@ class RedpacketService
/**
* 抢红包并返回详细结果
*/
public function grabWithResult($redpacketId, $userId, $password = '')
public function grabWithResult($redpacketId, $userId)
{
$redpacketModel = new Redpacket();
$redpacket = $redpacketModel->getRedpacketInfo($redpacketId);
@@ -43,17 +43,6 @@ class RedpacketService
];
}
// 验证口令红包
if ($redpacket['type'] == Redpacket::TYPE_PASSWORD) {
if (empty($password) || $password != $redpacket['password']) {
return [
'code' => 0,
'msg' => '口令错误',
'data' => null
];
}
}
// 验证领取条件
$conditionCheck = $this->checkConditionsWithResult($redpacket, $userId);
if ($conditionCheck['code'] != 1) {
@@ -129,7 +118,8 @@ class RedpacketService
'change_value' => $amount,
'room_id' => $redpacket['room_id'],
'money_type' => $redpacket['coin_type'],
'change_type' => 66,//抢红包收入
//记录日志 32-发红包金币29-发红包钻石30-抢红包金币31-抢红包(钻石)
'change_type' => $redpacket['coin_type'] == 1 ? 30 : 31,
'from_id' => $redpacket['room_id'],
'remarks' => '抢红包收入',
'createtime' => time()
@@ -153,9 +143,8 @@ class RedpacketService
$grabResult = $this->getGrabResult($redpacketId, $userId);
return [
'success' => true,
'code' => 'grab_success',
'message' => '抢红包成功',
'code' => 1,
'msg' => '抢红包成功',
'data' => $grabResult
];
@@ -167,9 +156,9 @@ class RedpacketService
$redis->sRem($userSetKey, $userId);
return [
'success' => false,
'code' => 'system_error',
'message' => '系统错误,请重试'
'code' => 0,
'msg' => '系统错误,请重试',
'data' => null
];
}
}
@@ -357,85 +346,6 @@ class RedpacketService
return ['code' => 1];
}
/**
* 抢红包
*/
// public function grab($redpacketId, $userId, $password = '')
// {
// $redpacketModel = new Redpacket();
// $redpacket = $redpacketModel->getRedpacketInfo($redpacketId);
//
// if (!$redpacket) {
// throw new \Exception('红包不存在');
// }
//
// // 验证口令红包
// if ($redpacket['type'] == Redpacket::TYPE_PASSWORD) {
// if (empty($password) || $password != $redpacket['password']) {
// throw new \Exception('口令错误');
// }
// }
//
// // 验证领取条件
// $this->checkConditions($redpacket, $userId);
//
// // 使用Redis+Lua保证原子性操作
// $redis = Cache::store('redis')->handler();
// $script = RedpacketLua::grabRedpacketScript();
//
// $redpacketKey = "redpacket:{$redpacketId}";
// $userSetKey = "redpacket_users:{$redpacketId}";
//
// $result = $redis->eval($script, [
// $redpacketKey,
// $userSetKey,
// $userId,
// time()
// ], 3);
//
// if ($result[0] == 0) {
// throw new \Exception($result[1]);
// }
//
// $amount = floatval($result[1]);
//
// // Lua脚本执行成功记录到数据库
// Db::startTrans();
// try {
// // 创建领取记录
// $recordData = [
// 'redpacket_id' => $redpacketId,
// 'user_id' => $userId,
// 'amount' => $amount
// ];
//
// $recordModel = new RedpacketRecord();
// $recordModel->save($recordData);
//
// // 更新用户钱包
// $walletModel = new UserWallet();
// $walletModel->increaseBalance($userId, $redpacket['coin_type'], $amount);
//
// // 更新红包剩余数量和金额
// Db::name('redpacket')
// ->where('id', $redpacketId)
// ->dec('left_amount', $amount)
// ->dec('left_count', 1)
// ->update();
//
// Db::commit();
//
// return $amount;
//
// } catch (\Exception $e) {
// Db::rollback();
// // 回滚Redis操作
// $redis->hIncrByFloat($redpacketKey, 'left_amount', $amount);
// $redis->hIncrBy($redpacketKey, 'left_count', 1);
// $redis->sRem($userSetKey, $userId);
// throw $e;
// }
// }
/**
* 获取红包详情和领取记录