用户钱包操作方法修改

application/common/model/Wallet.php

@@ -35,10 +35,10 @@ class Wallet extends Model
      * @param string $wallet_name 指定钱包名
      * @return array|float
      */
-    public function getWallet($user_id = '', $wallet_name = '')
+    public function getWallet($user_id = '',$company_id = '', $wallet_name = '')
     {
         //所有钱包余额
-        $wallet = Db::name('user_wallet')->lock(true)->where(['user_id' => $user_id])->find();
+        $wallet = Db::name('user_wallet')->where(['user_id' => $user_id,'company_id' => $company_id])->lock(true)->find();
         if(!$wallet) {
             abort(500,'钱包余额获取失败');
         }
@@ -67,7 +67,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($company_id,$user_id,$accountType='money',$number,$logtype='',$remark='',$table='',$table_id=0,$isAdmin=false)
     {
         //初始化
         $result = array(
@@ -99,7 +99,7 @@ class Wallet extends Model
 
 
         //检测
-        $wallet = Db::name('user_wallet')->lock(true)->where(['user_id'=>$user_id])->find();
+        $wallet = Db::name('user_wallet')->where(['user_id' => $user_id,'company_id' => $company_id])->lock(true)->find();
         if(!$wallet)
         {
             $result['msg'] = '不存在的用户';
@@ -118,6 +118,7 @@ class Wallet extends Model
 
             //钱币记录
             $data = array();
+            $data['company_id'] = $company_id;
             $data['user_id'] = $user_id;
             $data['log_type'] = $logtype;
             $data['before'] = $wallet[$accountType];
@@ -130,7 +131,7 @@ class Wallet extends Model
             $data['updatetime'] = time();
 
             //新的方式
-            $rs1 = Db::name('user_wallet')->where(['user_id'=>$user_id])->update([$accountType => $data['remain']]);
+            $rs1 = Db::name('user_wallet')->where(['user_id' => $user_id,'company_id' => $company_id])->update([$accountType => $data['remain']]);
 
             /////////////
             $log_table = 'user_'.$accountType.'_log';