收货

application/api/controller/Order.php

@@ -207,7 +207,7 @@ class Order extends Api
         $this->success('ok');
     }
 
-    //赠送22
+    //赠送
     public function giveaway(ProductOrder $productOrder, UserModel $userModel, LedgerWalletModel $ledgerWalletModel)
     {
         $params = $this->request->post();

application/common/model/LedgerWalletModel.php

@@ -222,7 +222,7 @@ class LedgerWalletModel extends Model
         //扣除冻结金额
         if($freeze > 0){
             if($freeze > -$amount) $walletUpdate['frozen']  = bcsub($freeze, -$amount, 6);
-            if($freeze <= -$amount) $walletUpdate = [$asset => bcadd($totalAmount, $amount, 6), 'freeze' => 0];
+            if($freeze <= -$amount) $walletUpdate = [$asset => bcadd($totalAmount, $amount, 6), 'frozen' => 0];
         }else{
             $newAmount    = bcadd($totalAmount, $amount, 6); // 新余额
             $walletUpdate = [$asset => $newAmount, 'update_time' => time()];