钻石明细，钻石转让

application/api/controller/Demo.php

@@ -59,7 +59,9 @@ class Demo extends Api
      */
     public function test1()
     {
-        $this->success('返回成功', ['action' => 'test1']);
+        $address = $this->ip_to_address();
+        $address = $address['provincename'].$address['cityname'];
+        dump($address);
     }
 
     /**

application/api/controller/Userwallet.php

@@ -73,7 +73,7 @@ class Userwallet extends Api
 
 
 
-    //我的余额日志
+    //我的积分日志
     public function my_money_log(){
         $type = input_post('type',0);
 
@@ -118,6 +118,29 @@ class Userwallet extends Api
 
         $this->success('success',$list);
     }
+    //钻石日志
+    public function my_jewel_log(){
+        $type = input_post('type',0);
+
+        $map = [
+            'user_id' => $this->auth->id,
+        ];
+//        if($type){
+//            $map['log_type'] = $type;
+//        }
+
+        $list = Db::name('user_jewel_log')
+            ->field('id,log_type,change_value,remain,remark,createtime, remark log_text')
+            ->where($map)->order('id desc')->autopage()->select();
+//        $list = $this->list_appen_logtext($list);
+        if(!empty($list)){
+            foreach($list as $key => $val){
+                $list[$key]['createtime'] = date('Y.m.d H:i', $val['createtime']);
+            }
+        }
+
+        $this->success('success',$list);
+    }
 
 
     //提现记录
@@ -405,7 +428,7 @@ class Userwallet extends Api
     //用户之间钻石转赠
     public function jewel_transfer(){
         $jewel = input('jewel',0,'intval');
-        $user_id = input('user_id',0,'intval');
+        $user_id = input('user_id',0,'trim');
 
         if(!$jewel || !$user_id){
             $this->error();
@@ -415,6 +438,12 @@ class Userwallet extends Api
             $this->error('输入数量为0');
         }
 
+        $find_user = Db::name('user')->where('id|mobile',$user_id)->find();
+        if(!$find_user){
+            $this->error('不存在的用户');
+        }
+        $user_id = $find_user['id'];
+
         Db::startTrans();
 
         $wallet_rs = model('wallet')->lockChangeAccountRemain($this->auth->id,0,'jewel',-$jewel,36,'钻石转赠');