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

2025-11-19 14:19:13 +08:00
parent fd94c7815d 1552ff51c4
commit ea50e5678e
2 changed files with 10 additions and 4 deletions
--- a/application/api/controller/UserCp.php
+++ b/application/api/controller/UserCp.php
@@ -12,7 +12,13 @@ class UserCp extends BaseCom
    {
        $user_id = input('user_id', 0);
        $gift_id = input('gift_id', 0);
-        $reslut = model('GiveGift')->give_gift($this->uid, $user_id, $gift_id,  1,1,1);
+        $room_id = input('room_id', 0);
+        if($room_id){
+            $from_type = 2;
+        }else{
+            $from_type = 1;
+        }
+        $reslut = model('GiveGift')->give_gift($this->uid, $user_id, $gift_id,  1,$from_type,1,$room_id);
        return V($reslut['code'], $reslut['msg'], $reslut['data']);
    }