Merge remote-tracking branch 'origin/develop' into develop

application/api/controller/BlindBoxTurntable.php

@@ -45,8 +45,11 @@ class BlindBoxTurntable extends BaseCom
      * 礼物发放
      */
     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);
         $reslut = model('BlindBoxTurntableGift')->gift_send($send_id);
+        redis_unlock($key_name);
         return v($reslut['code'], $reslut['msg'], $reslut['data']);
     }
 

application/api/model/RoomAuction.php

@@ -137,7 +137,7 @@ class RoomAuction extends Model
                 'auction_id' => $auction_id,
                 'user_id' => $user_id,
                 'gift_id' => $gift_id,
-                'gift_price' => $num * $gift_price,
+                'gift_price' => $ree['data']['gift_total'],
                 'createtime' => time()
             ]);
             if(!$res){