fix bug

api/Appapi/Api/User.php

@@ -76,6 +76,11 @@ class Api_User extends PhalApi_Api {
                 'token' => array('name' => 'token', 'type' => 'string', 'require' => true, 'desc' => '用户token'),
             ),
 
+            'getGiftSendDetail' => array(
+                'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'),
+                'token' => array('name' => 'token', 'type' => 'string', 'require' => true, 'desc' => '用户token'),
+            ),
+
             'liveDuration' => array(
                 'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'),
                 'token' => array('name' => 'token', 'type' => 'string', 'require' => true, 'desc' => '用户token'),
@@ -854,15 +859,33 @@ class Api_User extends PhalApi_Api {
     {
         $rs = array('code' => 0, 'msg' => '', 'info' => array());
 
-        $checkToken=checkToken($this->uid,$this->token);
-        if($checkToken==700){
-            $rs['code'] = $checkToken;
-            $rs['msg'] = '您的登陆状态失效，请重新登陆！';
+//        $checkToken=checkToken($this->uid,$this->token);
+//        if($checkToken==700){
+//            $rs['code'] = $checkToken;
+//            $rs['msg'] = '您的登陆状态失效，请重新登陆！';
+//            return $rs;
+//        }
+
+        $domain = new Domain_User();
+        $info = $domain->getGiftDetail($this->uid);
+
+        $rs['info'][0]=$info;
         return $rs;
     }
 
+    public function getGiftSendDetail()
+    {
+        $rs = array('code' => 0, 'msg' => '', 'info' => array());
+
+//        $checkToken=checkToken($this->uid,$this->token);
+//        if($checkToken==700){
+//            $rs['code'] = $checkToken;
+//            $rs['msg'] = '您的登陆状态失效，请重新登陆！';
+//            return $rs;
+//        }
+
         $domain = new Domain_User();
-        $info = $domain->getGiftDetail($this->uid);
+        $info = $domain->getGiftSendDetail($this->uid);
 
         $rs['info'][0]=$info;
         return $rs;

api/Appapi/Domain/User.php

@@ -74,6 +74,15 @@ class Domain_User {
         return $rs;
     }
 
+    public function getGiftSendDetail($uid) {
+        $rs = array();
+
+        $model = new Model_User();
+        $rs = $model->getGiftSendDetail($uid);
+
+        return $rs;
+    }
+
     public function liveDuration($uid) {
         $rs = array();
 

api/Appapi/Model/User.php

@@ -323,6 +323,33 @@ class Model_User extends PhalApi_Model_NotORM
     }
 
     /**
+     * 送礼物明细
+     *
+     * @param $uid
+     */
+    public function getGiftSendDetail($uid)
+    {
+        $where = "uid = {$uid} and type='expend' and action in ('sendgift','sendbarrage')";
+        $results = DI()->notorm->users_coinrecord->select('uid, giftid, giftcount, totalcoin')->where($where)->order('id desc')->limit(100)->fetchAll();
+        $gift = [];
+        $lists = DI()->notorm->gift->select('id, giftname')->fetchAll();
+        foreach ($lists as $list) {
+            $gift[$list['id']] = $list['giftname'];
+        }
+        $data = [];
+        foreach ($results as $result) {
+            $userinfo = getUserInfo($result['uid']);
+            $data[] = [
+                'gift_name'     => !empty($gift[$result['giftid']]) ? $gift[$result['giftid']] : '礼物',
+                'coin'          => $result['totalcoin'],
+                'number'        => $result['giftcount'],
+                'user_nicename' => $userinfo['user_nicename'],
+            ];
+        }
+        return $data;
+    }
+
+    /**
      * 直播明细
      *
      * @param $uid