diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 3df17140..336a67b4 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -285,11 +285,11 @@ class Auth extends BaseController if($merchant['margin'] == 0){ $margin = Db::name('MerchantType')->where('mer_type_id', $merchant['type_id'])->value('margin'); $margin = bcsub($margin,$merchant['paid_margin'],2); - if($margin==0){ - return app('json')->fail('当前金额为0,不能进行充值'); - } }else{ - $margin=0; + $margin=$merchant['margin']; + } + if($margin==0){ + return app('json')->fail('当前金额为0,不能进行充值'); } $orderSn = "bzj" . date('YmdHis') . uniqid(); Db::name('margin_order')->insert([