diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 049c5e0d..9ad145b5 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -422,7 +422,6 @@ class Auth extends BaseController
 
     public function doMargin()
     {
-        return app('json')->fail('线上缴纳调整中，请在线下缴纳');
         $user = $this->request->userInfo();
         $merchant = Db::name('merchant')->where('uid', $user['uid'])->where('status', 1)->find();
         if (!$merchant) {
diff --git a/app/listener/paySuccessMargin.php b/app/listener/paySuccessMargin.php
index 79f068e1..2d231869 100644
--- a/app/listener/paySuccessMargin.php
+++ b/app/listener/paySuccessMargin.php
@@ -18,7 +18,7 @@ class paySuccessMargin
         Db::startTrans();
         try {
             $order_sn = $event['order_sn'];
-            $marginInfo = Db::name('margin_order')->where('order_sn', $order_sn)->find();
+            $marginInfo = Db::name('margin_order')->where('order_sn', $order_sn)->where('paid',0)->find();
             if ($marginInfo) {
                 Db::name('margin_order')->where('order_id', $marginInfo['order_id'])->update([
                     'paid' => 1,
@@ -30,10 +30,7 @@ class paySuccessMargin
                 //已支付的押金
                 $paidMarginAmount = bcadd($merchantInfo['paid_margin'], $marginInfo['total_price'], 2);
                 Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
-                    'paid_margin' => $paidMarginAmount,'ot_margin'=>$paidMarginAmount
-                ]);
-                Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
-                    'margin' => 0
+                    'paid_margin' => $paidMarginAmount,'ot_margin'=>$paidMarginAmount,'margin' => 0
                 ]);
 
                 if ($paidMarginAmount ==$merchant_type['margin']) {
@@ -44,10 +41,13 @@ class paySuccessMargin
             }
             // 提交事务
             Db::commit();
+            return true;
         } catch (\Exception $e) {
             Log::error('微信支付押金失败' . $e->getMessage());
             // 回滚事务
             Db::rollback();
+            return false;
+
         }
 
     }