更新保证金支付

app/controller/admin/system/merchant/Merchant.php

@@ -190,7 +190,7 @@ class Merchant extends BaseController
      */
     public function checkParam(MerchantValidate $validate, $isUpdate = false)
     {
-        $data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid', 'auto_margin_rate', 'paid_margin']);
+        $data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid', 'auto_margin_rate', 'paid_margin', 'first_margin']);
         if (!$isUpdate) {
             $data += $this->request->params(['mer_account', 'mer_password']);
         }else {

app/controller/api/Auth.php

@@ -280,13 +280,9 @@ class Auth extends BaseController
         if (!$merchant) {
             return app('json')->fail('用户店铺异常');
         }
-        $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchant['type_id'])->find();
+        if ($merchant['first_margin'] > 0 && $merchant['first_margin_status'] == 0) {
-        if ($merchantTypeInfo['first_margin'] > 0) {
+            $merchant['margin'] = $merchant['first_margin'];
-            if (!$merchant['first_margin_status']) {
-                $merchant['margin'] = $merchantTypeInfo['first_margin'];
-            }
         }
-        
         $repository = app()->make(StoreOrderRepository::class);
         $orderSn = "bzj" . date('YmdHis') . uniqid();
         Db::name('margin_order')->insert([

app/controller/api/store/merchant/Merchant.php

@@ -264,18 +264,15 @@ class Merchant extends BaseController
         if(empty($id)){
             return app('json')->fail('参数不能为空');
         }
-        $merchantInfo = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,type_id,mer_name,margin,paid_margin,is_margin,first_margin_status')->find();
+        $merchantInfo = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,type_id,mer_name,margin,paid_margin,is_margin,first_margin,first_margin_status')->find();
         if(empty($merchantInfo)){
             return app('json')->fail('参数错误');
         }
         $merchantInfo['unpaid_margin'] = $merchantInfo['margin'];
-        $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find();
+        if ($merchant['first_margin'] > 0 && $merchant['first_margin_status'] == 0) {
-        if ($merchantTypeInfo['first_margin'] > 0) {
+            $merchantInfo['margin'] = $merchantInfo['first_margin'];
-            if ($merchantInfo['first_margin_status']) {
+        } else {
-                $merchantInfo['margin'] = $merchantInfo['margin'];
+            $merchantInfo['margin'] = $merchantTypeInfo['margin'];
-            } else {
-                $merchantInfo['margin'] = $merchantTypeInfo['first_margin'];
-            }
         }
         return app('json')->success($merchantInfo);
     }

app/listener/paySuccessMargin.php

@@ -31,9 +31,9 @@ class paySuccessMargin
             Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
                 'margin' => $marginAmount
             ]);
-            $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find();
+
-            if ($merchantTypeInfo['first_margin'] > 0) {
+            if ($merchantInfo['first_margin'] > 0 && $merchantInfo['first_margin_status'] == 0) {
-                if (!$merchantInfo['first_margin_status'] && ($marginInfo['total_price'] <= $merchantTypeInfo['first_margin'])) {
+                if ($marginInfo['total_price'] <= $merchantTypeInfo['first_margin']) {
                     Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
                         'first_margin_status' => 1
                     ]);

public/index.html

@@ -2,4 +2,4 @@
             document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
 						if(window.location.protocol == 'https:'){
 							document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
-						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.cd02d553.js></script></body></html>
+						}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.7f0cc918.js></script></body></html>