lizhen_gitee 1 năm trước cách đây
mục cha
commit
f4a93907b3

+ 7 - 0
application/admin/controller/Takecash.php

@@ -101,12 +101,19 @@ class Takecash extends Backend
                 //系统消息
                 $msg_id = \app\common\model\Message::addMessage($info['user_id'],'提现审核','提现审核已经通过');
 
+                $remark = '提现(成功)';
+                Db::name('user_gold_log')->where('table','take_cash')->where('table_id',$id)->update(['remark'=>$remark]);
+
                 $shouyi_result = $this->takecash($info['user_id'],$info['jewel'],'take_cash',$id);
                 if($shouyi_result !== true){
                     Db::rollback();
                     $this->error($shouyi_result);
                 }
             }elseif($status == 2){
+
+                $remark = '提现(驳回)';
+                Db::name('user_gold_log')->where('table','take_cash')->where('table_id',$id)->update(['remark'=>$remark]);
+
                 //还钱
                 $wallet_rs = model('wallet')->lockChangeAccountRemain($info['user_id'],'jewel',$info['jewel'],31,'提现被拒返回:'.$info['jewel'],'take_cash',$info['id']);
                 if($wallet_rs['status'] === false){

+ 1 - 1
application/api/controller/Takecash.php

@@ -110,7 +110,7 @@ class Takecash extends Api
         }
 
         //扣除money
-        $rs_wallet = model('Wallet')->lockChangeAccountRemain($this->auth->id,'jewel',-$jewel,30,'提现','take_cash',$log_id);
+        $rs_wallet = model('Wallet')->lockChangeAccountRemain($this->auth->id,'jewel',-$jewel,30,'提现(审核中)','take_cash',$log_id);
         if($rs_wallet['status']===false)
         {
             Db::rollback();

+ 1 - 1
application/api/controller/User.php

@@ -362,7 +362,7 @@ class User extends Api
     {
         $field_array = [
             'avatar','nickname','birthday','gender',
-            'audio_bio','photo_images','video_bio',
+            'audio_bio','audio_seconds','photo_images','video_bio',
             'height','weight','bio',
             'marital_id','job_id','wages_id','suqiu_id','tag_ids','hobby_ids',
             'hide_is_finishinfo',

+ 1 - 0
application/api/controller/Usercenter.php

@@ -33,6 +33,7 @@ class Usercenter extends Api
         'birthday',
         'bio',
         'audio_bio',
+        'audio_seconds',
         'video_bio',
 
         'photo_images',

+ 1 - 0
application/common/library/Auth.php

@@ -41,6 +41,7 @@ class Auth
         'birthday',
         'bio',
         'audio_bio',
+        'audio_seconds',
         'video_bio',
 
         'idcard_status',

+ 1 - 1
application/common/model/User.php

@@ -288,7 +288,7 @@ class User extends Model
         $res = Db::name('user')->where('id',$user_id)->update($data);
     }
     //增加亲密度,顺带升级
-    public function add_intimacy($uid = 0, $other_uid = 0, $value = 0) {
+    public static function add_intimacy($uid = 0, $other_uid = 0, $value = 0) {
         if($value <= 0) return false;
         //增加亲密度
         $level_remark = ''; //亲密度等级是否变动: 0未变动 >0是亲密度等级