操作money的方法都作废

application/admin/model/User.php

@@ -45,10 +45,10 @@ class User extends Model
 
         self::beforeUpdate(function ($row) {
             $changedata = $row->getChangedData();
-            if (isset($changedata['money'])) {
+            /*if (isset($changedata['money'])) {
                 $origin = $row->getOriginData();
                 MoneyLog::create(['user_id' => $row['id'], 'money' => $changedata['money'] - $origin['money'], 'before' => $origin['money'], 'after' => $changedata['money'], 'memo' => '管理员变更金额']);
-            }
+            }*/
             if (isset($changedata['score'])) {
                 $origin = $row->getOriginData();
                 ScoreLog::create(['user_id' => $row['id'], 'score' => $changedata['score'] - $origin['score'], 'before' => $origin['score'], 'after' => $changedata['score'], 'memo' => '管理员变更积分']);

application/api/controller/Live.php

@@ -649,7 +649,7 @@ class Live extends Common
             $where["id"] = $user_id;
             $res3 = $userModel->where($where)->setInc("jewel",$giftValue);
             // 添加赠送用户钻石流水记录
-            $res4 = $userjewellogModel->addUserJewelLog($user_id,$giftValue,"+",$touserInfo["jewel"],"获赠礼物：'".$giftInfo["name"]."',增加".$giftValue."钻石！");
+            $res4 = $userjewellogModel->addUserJewelLog($user_id,$giftValue,"+",$touserInfo["jewel"],"获赠礼物：'".$giftInfo["name"]."',增加".$giftValue."钻石！",9);
             // 添加礼物赠送记录表
             $data = [];
             $data["user_id"] = $this->auth->id;

application/api/controller/Money.php

@@ -828,6 +828,7 @@ class Money extends Common
      */
     public function exchange()
     {
+        exit;//作废
         // 接口防并发
         if (!$this->apiLimit(1, 1000)) {
             $this->error(__('Operation frequently'));
@@ -1590,12 +1591,7 @@ class Money extends Common
         }
 
         Db::startTrans();
-        /*//验证余额
-        $userwallet = Db::name('user')->where('id',$this->auth->id)->lock(true)->find();
-        if($userwallet['jewel'] < $money){
-            Db::rollback();
-            $this->error('余额不足');
-        }*/
+
         //减少和增加余额
         $rs_wallet = model('wallet')->lockChangeAccountRemain($this->auth->id,$money,'-',0,'私聊转账给:'.$check['nickname'],11,'jewel');
         if($rs_wallet['status'] === false){

application/common/model/User.php

@@ -87,6 +87,7 @@ class User extends Model
      */
     public static function money($money, $user_id, $memo)
     {
+        return;//作废
         $user = self::get($user_id);
         if ($user && $money != 0) {
             $before = $user->money;

application/extra/wallet.php

@@ -14,6 +14,7 @@ return [
         6  => '购买装扮',    //减少
         7  => '拒绝订单返还',    //增加
         8  => '完成用户订单获得收益',    //增加
+        9  => '获赠礼物', //增加
         11 => '私聊转账',  //减少
         12 => '私聊到账',  //增加
     ],