钱包迁移，api

application/api/controller/Attire.php

@@ -58,6 +58,7 @@ class Attire extends Api
         // 判断用户钻石余额是否充足
         $userModel = new \app\common\model\User();
         $userInfo = $userModel->where(["id"=>$this->auth->id])->find();
+        $userwallet = Db::name('user_wallet')->where('user_id',$this->auth->id)->find();
         if(!$userInfo) {
             $this->error("用户信息获取失败！");
         }
@@ -66,19 +67,26 @@ class Attire extends Api
         if(!$attireInfo) {
             $this->error("装扮信息获取失败！");
         }
-        if($userInfo["jewel"] < $attireInfo["price"]) {
+        if($userwallet["jewel"] < $attireInfo["price"]) {
             $this->error("您的余额不足，请先充值！");
         }
         // 进行购买逻辑
         Db::startTrans();
         try{
-            $userjewellogModel = new \app\common\model\UserJewelLog();
             // 扣除用户钻石余额
             $where = [];
             $where["id"] = $this->auth->id;
-            $res1 = $userModel->where($where)->setDec("jewel",$attireInfo["price"]);
+            $res1 = true;
             // 添加当前用户钻石流水记录
-            $res2 = $userjewellogModel->addUserJewelLog($this->auth->id, $attireInfo["price"], "-", $userInfo["jewel"], "购买装扮扣除" . $attireInfo["price"] . "钻石！", 6);
+            $res2 = true;
+
+            //增加用户钻石余额
+            $rs_wallet = model('wallet')->lockChangeAccountRemain($this->auth->id, $attireInfo["price"], "-", 0, "购买装扮扣除" . $attireInfo["price"] . "钻石！", 6,'jewel');
+            if($rs_wallet['status'] == false){
+                Db::rollback();
+                $this->error($rs_wallet['msg']);
+            }
+
             // 添加装扮购买记录
             $data = [];
             $data["user_id"] = $this->auth->id;

application/api/controller/Dispatch.php

@@ -537,19 +537,18 @@ class Dispatch extends Common
             $where = [];
             $where["id"] = $this->auth->id;
             $userInfo = $userModel->where($where)->find();
-            $res1 = $userModel->where($where)->setDec("jewel",$money);
+            $res1 = true;
             $res2 = $userModel->where($where)->setInc("frozen",$money);
             // 添加用户余额变动记录
-            $userjewellogModel = new \app\common\model\UserJewelLog();
-            $data = [];
-            $data["user_id"] = $this->auth->id;
-            $data["value"] = $money;
-            $data["mode"] = "-";
-            $data["before"] = $userInfo["jewel"];
-            $data["balance"] = $userInfo["jewel"]-$money;
-            $data["detail"] = "下单扣除余额";
-            $data["createtime"] = time();
-            $res3 = $userjewellogModel->insertGetId($data);
+            $res3 = true;
+            //增加用户钻石余额
+            $rs_wallet = model('wallet')->lockChangeAccountRemain($this->auth->id, $money, "-", 0, "下单扣除余额", 0,'jewel');
+            if($rs_wallet['status'] == false){
+                Db::rollback();
+                $this->error($rs_wallet['msg']);
+            }
+
+
             // 添加订单信息
             $orderModel = new \app\common\model\DispatchOrder();
             // 修改订单状态

application/api/controller/Noble.php

@@ -126,7 +126,6 @@ class Noble extends Api
             $this->error(__('贵族等级信息有误！'));
         }
         $userModel = new \app\common\model\User();
-        $userjewellogModel = new \app\common\model\UserJewelLog();
         $where = [];
         $where["id"] = $this->auth->id;
         $userInfo = $userModel->where($where)->find();

application/api/controller/Notify.php

@@ -204,7 +204,6 @@ class Notify extends Api
                 try {
                     $orderModel = new \app\common\model\RecharOrder();
                     $userModel = new \app\common\model\User();
-                    $jewellogModel = new \app\common\model\UserJewelLog();
                     $rechargelogModel = new \app\common\model\UserRechargeLog();
                     $orderInfo = $orderModel->where(["order_no" => $out_trade_no])->find();
                     $userInfo = $userModel->where(["id" => $orderInfo["user_id"]])->find();

application/common/model/UserJewelLog.php

@@ -20,6 +20,7 @@ class UserJewelLog extends Model
      */
     public function addUserJewelLog($user_id, $money, $mode, $before, $detail, $type = 1)
     {
+        测试报错
         if ($mode == "+") {
             $balance = $before + $money;
         } else {