送礼物优化

application/api/controller/Party.php

@@ -1651,7 +1651,7 @@ class Party extends Common
 
             // 随机获取一个礼物
             $allCount = $number*$userCount;
-            $giftbackList = Db::name('gift_back')->field('id,value,name,image,gif_image,number')->where(["gift_id"=>$backGiftId,"user_id"=>$userauthid,'is_use'=>0])->limit($allCount)->select();
+            $giftbackList = Db::name('gift_back')->field('id,value,name,image,gif_image,number')->where(["gift_id"=>$backGiftId,"user_id"=>$userauthid,'is_use'=>0])->limit($allCount)->order('id asc')->select();
             $giftInfo = isset($giftbackList[0]) ? $giftbackList[0] : [];
             $giftcount = 0;
             $giftList = [];
@@ -1700,7 +1700,7 @@ class Party extends Common
 
         }
 
-        //此时 $giftValue,$getValue,$hotValue是相等的
+        //此时 $giftValue,$getValue,$hotValue是相等的(除了盒子礼物特殊)
         $hotValue = $getValue;
 
         //进行抽点设置
@@ -1716,9 +1716,7 @@ class Party extends Common
         }
 
         //getValue削减
-        $platValue    = bcmul($platRate/100   ,$getValue,2); //平台抽成
-        $guilderValue = bcmul($guilderRate/100,$getValue,2);// 工会长抽成
-        $getValue     = bcsub(bcsub($getValue ,$platValue,2),$guilderValue,2);//减去抽成剩余价值
+       
 
         //
         $returnData = [];
@@ -1763,10 +1761,10 @@ class Party extends Common
                             $b++;
                             $num = $v["number"] - $a;
                             if($num > 0) {
-                                $res1 = \app\common\model\GiftBack::where(["id"=>$v["id"]])->setDec("number");
+                                $res1 = Db::name('gift_back')->where(["id"=>$v["id"]])->setDec("number");
                             } else {
 //                                $res1 = \app\common\model\GiftBack::update(["is_use"=>1,"use_time"=>time()],["id"=>$v["id"]]);
-                                $res1 = \app\common\model\GiftBack::where(["id"=>$v["id"]])->delete();
+                                $res1 = Db::name('gift_back')->where(["id"=>$v["id"]])->delete();
                             }
                             if($b == $number) break;
                         }
@@ -1810,9 +1808,10 @@ class Party extends Common
                 }
 
                 //每个礼物都要计算平台抽成和房主抽成
-                $data['platvalue']    = bcmul($platRate/100        ,$data["value"],2);
-                $data['guildervalue'] = bcmul($guilderRate/100     ,$data["value"],2);
+                $data['platvalue']    = bcmul($platRate/100        ,$data["value"],2);//平台抽成
+                $data['guildervalue'] = bcmul($guilderRate/100     ,$data["value"],2);// 工会长抽成
                 $data['guildermoney'] = bcdiv($data['guildervalue'],$money_to_jewel,2);
+                $data['getvalue']     = bcsub(bcsub($data["value"] ,$data['platvalue'],2),$data['guildervalue'],2);//减去抽成剩余价值
 
                 $data['task_status'] = 0;
                 $data["createtime"] = time();
@@ -1822,8 +1821,8 @@ class Party extends Common
                 $this->bigGiftNotice($this->auth->nickname,$touserInfo['nickname'],$partyInfo,$data);
 
                 // 添加获赠用户余额
-                if($getValue > 0){
-                    $getMoney = bcdiv($getValue,$money_to_jewel,2);
+                if($data['getvalue'] > 0){
+                    $getMoney = bcdiv($data['getvalue'],$money_to_jewel,2);
                     if($getMoney > 0){
                         $rs_wallet = model('wallet')->lockChangeAccountRemain($user_id,$getMoney,'+',0,"{$this->auth->nickname}送你{$giftInfo['name']}x{$number}",101,'money');
                         if($rs_wallet['status'] == false){
@@ -1834,8 +1833,8 @@ class Party extends Common
                 }
 
                 // 增加房主抽成
-                if ($partyInfo && $guilderValue > 0) {
-                    $guilderMoney = bcdiv($guilderValue,$money_to_jewel,2);
+                if ($partyInfo && $data['guildervalue'] > 0) {
+                    $guilderMoney = bcdiv($data['guildervalue'],$money_to_jewel,2);
                     if($guilderMoney > 0){
                         $rs_wallet = model('wallet')->lockChangeAccountRemain($partyInfo->user_id,$guilderMoney,'+',0,"{$this->auth->nickname}送礼物{$giftInfo['name']}x{$number}给{$touserInfo['nickname']},房间礼物抽成",102,'money');
                         if($rs_wallet['status'] == false){
@@ -1956,14 +1955,6 @@ class Party extends Common
                 }
 
                 // 增加抽点记录
-                $data = [];
-                $data["user_id"] = $user_ids;
-                $data["party_id"] = $party_id?$party_id:0;
-                $data["gift_value"] = $giftValue;
-                $data["plat_value"] = $platValue;
-                $data["guilder_value"] = $guilderValue;
-                $data["createtime"] = time();
-                \app\common\model\UserProfitLog::insert($data);
 
                 Db::commit();
                 $this->success("赠送成功！",$returnData);