update

app/models/user/UserRecharge.php

@@ -169,6 +169,7 @@ class UserRecharge extends BaseModel
             return self::setErrorInfo($e->getMessage());
         }
     }
+
     /**
      * 导入佣金到余额
      * @param $uid 用户uid
@@ -182,18 +183,21 @@ class UserRecharge extends BaseModel
     public static function Wdc2Money($uid, $price)
     {
         $user = User::getUserInfo($uid);
+        if ($price + $user['wdc_trade'] > $user['wdc_all'] * 0.6) {
+            return self::setErrorInfo("可转酒币不足，您获得的酒币总量为{$user['wdc_all']}，其中60%为可转酒币，已转{$user['wdc_trade']}！");
+        }
         self::beginTrans();
         try {
             $broken_time = intval(sys_config('extract_time'));
             $search_time = time() - 86400 * $broken_time;
             $commissionCount = $user['wdc'];
             if ($price > $commissionCount) return self::setErrorInfo('转入金额不能大于酒币！');
-            $commission = bcmul($price,bcmul(sys_config('wdc2money',40),0.01,2),2);
-            $value = bcsub($price,$commission);
+            $commission = bcmul($price, bcmul(sys_config('wdc2money', 40), 0.01, 2), 2);
+            $value = bcsub($price, $commission);
             $res1 = User::bcInc($uid, 'now_money', $value, 'uid');
             $res3 = User::bcDec($uid, 'wdc', $price, 'uid');
-            $res2 = UserBill::income('用户酒币转入余额', $uid, 'now_money', 'recharge', $value, 0, $user['now_money'], '成功转入余额' . floatval($value) . '元'."手续费".$commission);
-            $res4 = UserBill::expend('用户酒币转入余额', $uid, 'now_money', 'wdc', $value, 0, $user['now_money'], '成功转入余额' . floatval($value) . '元'.$commission);
+            $res2 = UserBill::income('用户酒币转入余额', $uid, 'now_money', 'recharge', $value, 0, $user['now_money'], '成功转入余额' . floatval($value) . '元' . "手续费" . $commission);
+            $res4 = UserBill::expend('用户酒币转入余额', $uid, 'now_money', 'wdc', $value, 0, $user['now_money'], '成功转入余额' . floatval($value) . '元' . $commission);
             $res = $res2 && $res1 && $res3 && $res4;
             self::checkTrans($res);
             return $res;