Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -45,8 +45,11 @@ class BlindBoxTurntable extends BaseCom
|
|||||||
* 礼物发放
|
* 礼物发放
|
||||||
*/
|
*/
|
||||||
public function gift_send(){
|
public function gift_send(){
|
||||||
|
$key_name = "api:blind_box_turntable:gift_send:" . $this->uid;
|
||||||
|
redis_lock_exit($key_name);
|
||||||
$send_id = input('send_id',0);
|
$send_id = input('send_id',0);
|
||||||
$reslut = model('BlindBoxTurntableGift')->gift_send($send_id);
|
$reslut = model('BlindBoxTurntableGift')->gift_send($send_id);
|
||||||
|
redis_unlock($key_name);
|
||||||
return v($reslut['code'], $reslut['msg'], $reslut['data']);
|
return v($reslut['code'], $reslut['msg'], $reslut['data']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ class RoomAuction extends Model
|
|||||||
'auction_id' => $auction_id,
|
'auction_id' => $auction_id,
|
||||||
'user_id' => $user_id,
|
'user_id' => $user_id,
|
||||||
'gift_id' => $gift_id,
|
'gift_id' => $gift_id,
|
||||||
'gift_price' => $num * $gift_price,
|
'gift_price' => $ree['data']['gift_total'],
|
||||||
'createtime' => time()
|
'createtime' => time()
|
||||||
]);
|
]);
|
||||||
if(!$res){
|
if(!$res){
|
||||||
|
|||||||
Reference in New Issue
Block a user