钱包方法简化

application/api/controller/Usercenter.php

@@ -27,6 +27,7 @@ class Usercenter extends Api
         'real_status',
 
 
+        'cityname',
         'gender',
         'height',
         'weight',
@@ -109,10 +110,10 @@ class Usercenter extends Api
         //$userinfo['power'] = Db::name('user_power')->where('user_id',$uid)->find();
 
         //vip如果开了隐私保护，需要隐藏距离
-        /*$weizhi = $this->user_power($userinfo['id'],'weizhi');
-        if($weizhi == 1){
-//            $userinfo['cityname'] = '';
-        }*/
+        $weizhi = $this->user_power($userinfo['id'],'weizhi');
+        if($weizhi == 0){
+            $userinfo['cityname'] = '';
+        }
 
         //追加登录用户的头像
         $userinfo['my_avatar'] = localpath_to_netpath($this->auth->avatar);
@@ -214,10 +215,10 @@ class Usercenter extends Api
         //$userinfo['power'] = Db::name('user_power')->where('user_id',$uid)->find();
 
         //vip如果开了隐私保护，需要隐藏距离
-        /*$weizhi = $this->user_power($userinfo['id'],'weizhi');
-        if($weizhi == 1){
-//            $userinfo['cityname'] = '';
-        }*/
+        $weizhi = $this->user_power($userinfo['id'],'weizhi');
+        if($weizhi == 0){
+            $userinfo['cityname'] = '';
+        }
 
         //追加登录用户的头像
         $userinfo['my_avatar'] = localpath_to_netpath($this->auth->avatar);

application/common/model/Wallet.php

@@ -77,7 +77,7 @@ class Wallet extends Model
      * @return array[log_table]
      * @return array[log_id]
      */
-    public function lockChangeAccountRemain($user_id,$accountType='money',$number,$logtype='',$remark='',$table='',$table_id=0,$isAdmin=false)
+    public function lockChangeAccountRemain($user_id,$accountType='gold',$number,$logtype='',$remark='',$table='',$table_id=0,$isAdmin=false)
     {
         //初始化
         $result = array(
@@ -122,56 +122,40 @@ class Wallet extends Model
         }
         else
         {
-            if(0 !== bccomp($number, 0))
-            {
-
-                //钱币记录
-                $data = array();
-                $data['user_id'] = $user_id;
-                $data['log_type'] = $logtype;
-                $data['money_type'] = $accountType;
-                $data['before'] = $wallet[$accountType];
-                $data['change_value'] = $number;
-                $data['remain'] = bcadd($wallet[$accountType], $number);
-                $data['table'] = $table;
-                $data['table_id'] = $table_id;
-                $data['remark'] = $remark;
-                $data['createtime'] = time();
-                $data['updatetime'] = time();
-
-                //新的方式
-                $rs1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->update([$accountType => $data['remain']]);
-
-
-
-                /////////////
-                $log_table = 'user_gold_log';
-
-                $rs2_id = Db::name($log_table)->insertGetId($data);
-
-                if($rs1 === false || $rs2_id === false){
-                    $result['msg'] = '更新财务记录失败!';
-                    return $result;
-                }
-
-                if( $rs1 !== false && $rs2_id !== false )
-                {
-                    $result['status'] = true;
-                    $result['msg'] = '账户余额已更新!';
-                    $result['log_table'] = $log_table;
-                    $result['log_id'] = $rs2_id;
-
-                    return $result;
-                }
-                else
-                {
-                    $result['msg'] = '更新财务记录失败!';
-                    return $result;
-                }
-            } else {
-                $result['msg'] = '金额不足0.01';
+            //钱币记录
+            $data = array();
+            $data['user_id'] = $user_id;
+            $data['log_type'] = $logtype;
+            $data['money_type'] = $accountType;
+            $data['before'] = $wallet[$accountType];
+            $data['change_value'] = $number;
+            $data['remain'] = bcadd($wallet[$accountType], $number);
+            $data['table'] = $table;
+            $data['table_id'] = $table_id;
+            $data['remark'] = $remark;
+            $data['createtime'] = time();
+            $data['updatetime'] = time();
+
+            //修改金额
+            $rs1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->update([$accountType => $data['remain']]);
+
+            /////////////
+            $log_table = 'user_gold_log';
+
+            $rs2_id = Db::name($log_table)->insertGetId($data);
+
+            if($rs1 === false || $rs2_id === false){
+                $result['msg'] = '更新财务记录失败!';
                 return $result;
             }
+
+            $result['status'] = true;
+            $result['msg'] = '账户余额已更新!';
+            $result['log_table'] = $log_table;
+            $result['log_id'] = $rs2_id;
+
+            return $result;
+
         }
     }