shish 2 ani în urmă
părinte
comite
238dba59af

+ 1 - 1
app-ghs/controllers/CashController.php

@@ -30,7 +30,7 @@ class CashController extends BaseController
     //申请提现 ssh 2021.3.14
     public function actionApply()
     {
-        util::fail('系统自动提现,无需人为操作');
+        //util::fail('系统自动提现,无需人为操作');
         $get = Yii::$app->request->get();
         $get['shopAdminId'] = $this->shopAdminId;
         $shopAdmin = $this->shopAdmin;

+ 0 - 6
app-pt/controllers/CashController.php

@@ -60,13 +60,11 @@ class CashController extends BaseController
             }
             $cashAmount = isset($cash->amount) ? floatval($cash->amount) : 0;
             if ($cashAmount <= 0) {
-                CashClass::rollback($cash, $shop, $transaction, $cashAmount, $remark);
                 util::fail('提现金额有问题');
             }
             $miniCashAmount = dict::getDict('miniCashAmount');
             if ($cashAmount < $miniCashAmount) {
                 if (getenv('YII_ENV') == 'production') {
-                    CashClass::rollback($cash, $shop, $transaction, $cashAmount, $remark);
                     util::fail("余额不足{$miniCashAmount}元");
                 }
             }
@@ -74,24 +72,20 @@ class CashController extends BaseController
             $getAmount = $cash->beAmount;
 
             if ($status != CashClass::STATUS_CHECK_YES) {
-                CashClass::rollback($cash, $shop, $transaction, $cashAmount, $remark);
                 util::fail('已审核过');
             }
 
             $cashAccount = $main->cashAccount ?? '';
             $cashName = $main->cashName ?? '';
             if (empty($cashAccount) || empty($cashName)) {
-                CashClass::rollback($cash, $shop, $transaction, $cashAmount, $remark);
                 util::fail('提现帐号未填写完整');
             }
             $cashSn = $cash->orderSn;
             if (empty($cashSn)) {
-                CashClass::rollback($cash, $shop, $transaction, $cashAmount, $remark);
                 util::fail('没有找到订单号');
             }
 
             if (bccomp($cashAmount, $main->freezeBalance) == 1) {
-                CashClass::rollback($cash, $shop, $transaction, $cashAmount, $remark);
                 util::fail('冻结金额不足提现');
             }