送礼物优化

application/api/controller/Party.php

@@ -1618,6 +1618,9 @@ class Party extends Common
         {
             $this->error(__('Invalid parameters'));
         }
+        if(!$party_id){
+            $this->error('只有房间内能送礼物');
+        }
 
         //处理参数
         $user_id_arr = explode(",",$user_ids);
@@ -1632,6 +1635,13 @@ class Party extends Common
         $backGiftId = 0; //背包礼物表的 gift_id
         $boxgiftInfo = [];
 
+        //每个人都能得到的礼物价值
+        $giftValue = 0;
+        //每个人都能得到的礼物价值
+        $getValue = 0;
+        //热度值
+        $hotValue = 0;
+
         if($is_back == 1) {
             // 获取背包礼物信息
             $giftInfo = \app\common\model\GiftBack::get($gift_id);
@@ -1659,7 +1669,7 @@ class Party extends Common
 
             if($giftcount < $allCount) $this->error("背包数量不足");
             $giftValue = $giftInfo["value"] * $number;
-            $getValue  = $giftInfo["value"] * $number;
+            $getValue  = $giftValue;
         } else {
 
             // 获取礼物信息
@@ -1668,22 +1678,23 @@ class Party extends Common
                 $this->error("请选择礼物！");
             }
             $giftValue = $giftInfo["value"] * $number;
-            $giftCountValue = $giftInfo["value"] * $number * $userCount;
-            $getValue = $giftValue;
+            $getValue  = $giftValue;
+
             // 判断如果是礼物盒则随机开礼物盒礼物
             if($giftInfo->box_type > 0) {
                 $boxgiftInfo = $this->getBoxGift($giftInfo->box_type);
                 $getValue = $boxgiftInfo["price"];
             }
 
-            // 判断当前用户余额
-            $where = [];
-            $where["id"] = $userauthid;
-            $userInfo = $userModel->where($where)->lock(true)->find();
-            if (!$userInfo) $this->error("用户信息查询失败！");
-            if($userInfo["jewel"] < $giftCountValue) $this->error("您的钻石余额不足！");
+            // 判断当前用户余额,这里不需要锁表,钱包操作会锁
+            $giftCountValue = $giftInfo["value"] * $number * $userCount;
+            if($this->auth->jewel < $giftCountValue){
+                $this->error("您的钻石余额不足！");
+            }
+
         }
 
+        //此时 $giftValue,$getValue,$hotValue是相等的
         $hotValue = $getValue;
 
         // 转换声币后 再进行抽点设置
@@ -1694,13 +1705,13 @@ class Party extends Common
         } else {
             $partyInfo = \app\common\model\Party::field("user_id,platRate,guilderRate")->where(["id"=>$party_id])->find();
             // 获取系统配置信息
-            $platRate = $partyInfo->platRate; // 平台抽成百分比
+            $platRate    = $partyInfo->platRate; // 平台抽成百分比
             $guilderRate = $partyInfo->guilderRate; // 工会长抽成百分比
         }
 
-        $platValue = bcmul($platRate/100,$getValue,2); //平台抽成
+        $platValue    = bcmul($platRate/100   ,$getValue,2); //平台抽成
         $guilderValue = bcmul($guilderRate/100,$getValue,2);// 工会长抽成
-        $getValue = bcsub(bcsub($getValue,$platValue,2),$guilderValue,2);//减去抽成剩余价值
+        $getValue     = bcsub(bcsub($getValue ,$platValue,2),$guilderValue,2);//减去抽成剩余价值
 
 //        $gif_image = $is_back==1?$giftInfo["gif_image"]:$giftInfo["special"];
         $returnData = [];
@@ -1752,7 +1763,7 @@ class Party extends Common
                     $res2 = true;
 
                     // 扣除当前用户钻石余额
-                    $rs_wallet = model('wallet')->lockChangeAccountRemain($userauthid, $giftValue, '-', $userInfo["jewel"], "赠送礼物：'" . $giftInfo["name"] . "',扣除" . $giftValue . "钻石！", 3,'jewel');
+                    $rs_wallet = model('wallet')->lockChangeAccountRemain($userauthid, $giftValue, '-', $this->auth->jewel, "赠送礼物：'" . $giftInfo["name"] . "',扣除" . $giftValue . "钻石！", 3,'jewel');
                     if($rs_wallet['status'] == false){
                         $this->error($rs_wallet['msg']);
                         Db::rollback();