update

app/admin/controller/user/User.php

@@ -194,7 +194,7 @@ class User extends AuthController
             if ($data['wdc_status'] == 1) {//增加
                 $edit['wdc'] = bcadd($user['wdc'], $data['wdc'], 2);
                 $edit['wdc_all'] = bcadd($user['wdc_all'], $data['wdc'], 2);
-                $res21 = UserBillAdmin::income('系统增加酒币', $user['uid'], 'wdc', 'system_add', $data['wdc'], $this->adminId, $edit['wdc'], '系统增加了' . floatval($data['wdc']) . 'wdc');
+                $res21 = UserBillAdmin::income('系统增加酒币', $user['uid'], 'wdc', 'system_add', $data['wdc'], $this->adminId, $edit['wdc'], '系统增加了' . floatval($data['wdc']) . '酒币');
                 try {
                     UserRepository::adminAddwdc($user, $data['wdc']);
                 } catch (\Exception $e) {
@@ -204,7 +204,7 @@ class User extends AuthController
             } else if ($data['wdc_status'] == 2) {//减少
                 $edit['wdc'] = bcsub($user['wdc'], $data['wdc'], 2);
                 $edit['wdc_all'] = bcsub($user['wdc_all'], $data['wdc'], 2);
-                $res21 = UserBillAdmin::expend('系统增加酒币', $user['uid'], 'wdc', 'system_sub', $data['wdc'], $this->adminId, $edit['wdc'], '系统扣除了' . floatval($data['wdc']) . 'wdc');
+                $res21 = UserBillAdmin::expend('系统增加酒币', $user['uid'], 'wdc', 'system_sub', $data['wdc'], $this->adminId, $edit['wdc'], '系统扣除了' . floatval($data['wdc']) . '酒币');
                 try {
                     UserRepository::adminAddwdc($user, $data['wdc']);
                 } catch (\Exception $e) {

app/models/user/UserRecharge.php

@@ -183,8 +183,10 @@ 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']}！");
+        $commission = bcmul($user['wdc_all'], bcmul(sys_config('wdc2money', 40), 0.01, 2), 2);
+        $value = bcsub($user['wdc_all'], $commission);
+        if ($price + $user['wdc_trade'] > $value) {
+            return self::setErrorInfo("可转酒币不足，您的可转酒币余额为$value");
         }
         self::beginTrans();
         try {
@@ -192,8 +194,9 @@ class UserRecharge extends BaseModel
             $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);
+            $value = $price;
             $res1 = User::bcInc($uid, 'now_money', $value, 'uid');
             $res5 = User::bcInc($uid, 'wdc_trade', $price, 'uid');
             $res3 = User::bcDec($uid, 'wdc', $price, 'uid');