踢人

api/Appapi/Model/Live.php

@@ -548,7 +548,7 @@ class Model_Live extends PhalApi_Model_NotORM {
         $giftinfo = [
             'type'     => 1,
             'mark'     => 4,
-            'giftname' => '福利袋',
+            'giftname' => '宝箱',
             'gifticon' => 'http://qiniu.huad.leacho.cn/20190723/5d367483cb9ac.png',
             'needcoin' => $welfare['rate'],
             'swftype'  => 0,
@@ -722,7 +722,7 @@ class Model_Live extends PhalApi_Model_NotORM {
 
         /* 礼物信息 */
 		$giftinfo=DI()->notorm->gift
-					->select("type,mark,giftname,gifticon,needcoin,swftype,swf,swftime")
+					->select("type,mark,giftname,gifticon,votes,needcoin,swftype,swf,swftime")
 					->where('id=?',$giftid)
 					->fetchOne();
 		if(!$giftinfo){
@@ -756,6 +756,8 @@ class Model_Live extends PhalApi_Model_NotORM {
 			return 1001;
         }
 
+        $total = $giftinfo['votes']*$giftcount;
+
 		/* 分销 */
 		setAgentProfit($uid,$total);
 		/* 分销 */

api/Common/functions.php

@@ -1339,7 +1339,7 @@
 
                         DI()->notorm->users
                                 ->where('id = ?', $familyinfo['uid'])
-                                ->update( array( 'votes' => new NotORM_Literal("votes + {$family_total}")  ));
+                                ->update( array( 'f_votes' => new NotORM_Literal("f_votes + {$family_total}")  ));
 
                         $insert_votes=[
                             'type'=>'income',