stanley-king 3 лет назад
Родитель
Сommit
fa6fb71dc2
1 измененных файлов с 40 добавлено и 20 удалено
  1. 40 20
      data/model/predeposit.model.php

+ 40 - 20
data/model/predeposit.model.php

@@ -279,10 +279,12 @@ class predepositModel extends Model {
                 $data_log['lg_desc'] = '下单,冻结预存款,订单号: '.$data['order_sn'];
 
                 $data_pd['available_predeposit'] = ['exp','available_predeposit-'.$data['amount']];
-                $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit+'.$data['amount']];
-
                 $dive_pd['available_predeposit'] = ['reduce' => $data['amount']];
-                $dive_pd['freeze_predeposit'] = ['add' => $data['amount']];
+
+                if(!$fRefill) {
+                    $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit+'.$data['amount']];
+                    $dive_pd['freeze_predeposit'] = ['add' => $data['amount']];
+                }
 
                 $data_msg['av_amount'] = -$data['amount'];
                 $data_msg['freeze_amount'] = $data['amount'];
@@ -295,10 +297,12 @@ class predepositModel extends Model {
                 $data_log['lg_desc'] = '取消订单,解冻预存款,订单号: '.$data['order_sn'];
 
                 $data_pd['available_predeposit'] = ['exp','available_predeposit+'.$data['amount']];
-                $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit-'.$data['amount']];
-
                 $dive_pd['available_predeposit'] = ['add' => $data['amount']];
-                $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+
+                if(!$fRefill) {
+                    $data_pd['freeze_predeposit'] = ['exp', 'freeze_predeposit-' . $data['amount']];
+                    $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+                }
 
                 $data_msg['av_amount'] = $data['amount'];
                 $data_msg['freeze_amount'] = -$data['amount'];
@@ -308,8 +312,10 @@ class predepositModel extends Model {
                 $data_log['lg_freeze_amount'] = -$data['amount'];
                 $data_log['lg_desc'] = '下单,支付被冻结的预存款,订单号: '.$data['order_sn'];
 
-                $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit-'.$data['amount']];
-                $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+                if(!$fRefill) {
+                    $data_pd['freeze_predeposit'] = ['exp', 'freeze_predeposit-' . $data['amount']];
+                    $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+                }
 
                 $data_msg['av_amount'] = 0;
                 $data_msg['freeze_amount'] = $data['amount'];
@@ -356,10 +362,12 @@ class predepositModel extends Model {
                 $data_log['lg_desc'] = '申请提现,冻结预存款,提现单号: '.$data['order_sn'];
 
                 $data_pd['available_predeposit'] = ['exp','available_predeposit-'.$data['amount']];
-                $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit+'.$data['amount']];
-
                 $dive_pd['available_predeposit'] = ['reduce' => $data['amount']];
-                $dive_pd['freeze_predeposit'] = ['add' => $data['amount']];
+
+                if(!$fRefill) {
+                    $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit+'.$data['amount']];
+                    $dive_pd['freeze_predeposit'] = ['add' => $data['amount']];
+                }
 
                 $data_msg['av_amount'] = -$data['amount'];
                 $data_msg['freeze_amount'] = $data['amount'];
@@ -370,8 +378,10 @@ class predepositModel extends Model {
                 $data_log['lg_desc'] = '提现成功,提现单号: '.$data['order_sn'];
                 $data_log['lg_admin_name'] = $data['admin_name'];
 
-                $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit-'.$data['amount']];
-                $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+                if(!$fRefill) {
+                    $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit-'.$data['amount']];
+                    $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+                }
 
                 $data_msg['av_amount'] = 0;
                 $data_msg['freeze_amount'] = -$data['amount'];
@@ -384,9 +394,12 @@ class predepositModel extends Model {
                 $data_log['lg_admin_name'] = $data['admin_name'];
 
                 $data_pd['available_predeposit'] = ['exp','available_predeposit+'.$data['amount']];
-                $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit-'.$data['amount']];
                 $dive_pd['available_predeposit'] = ['add' => $data['amount']];
-                $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+
+                if(!$fRefill) {
+                    $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit-'.$data['amount']];
+                    $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+                }
 
                 $data_msg['av_amount'] = $data['amount'];
                 $data_msg['freeze_amount'] = -$data['amount'];
@@ -410,7 +423,7 @@ class predepositModel extends Model {
                 $data_log['lg_desc'] = '管理员调节预存款【减少】,充值单号: '.$data['pdr_sn'];
                 $data_log['lg_admin_name'] = $data['admin_name'];
 
-                $data_pd['available_predeposit'] = ['exp','available_predeposit-'.$data['amount']];
+                $data_pd['available_predeposit'] = ['exp', 'available_predeposit-' . $data['amount']];
                 $dive_pd['available_predeposit'] = ['reduce' => $data['amount']];
 
                 $data_msg['av_amount'] = -$data['amount'];
@@ -423,9 +436,12 @@ class predepositModel extends Model {
                 $data_log['lg_desc'] = '管理员调节预存款【冻结】,充值单号: '.$data['pdr_sn'];
 
                 $data_pd['available_predeposit'] = ['exp','available_predeposit-'.$data['amount']];
-                $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit+'.$data['amount']];
                 $dive_pd['available_predeposit'] = ['reduce' => $data['amount']];
-                $dive_pd['freeze_predeposit'] = ['add' => $data['amount']];
+
+                if (!$fRefill) {
+                    $data_pd['freeze_predeposit'] = ['exp', 'freeze_predeposit+' . $data['amount']];
+                    $dive_pd['freeze_predeposit'] = ['add' => $data['amount']];
+                }
 
                 $data_msg['av_amount'] = -$data['amount'];
                 $data_msg['freeze_amount'] = $data['amount'];
@@ -438,9 +454,13 @@ class predepositModel extends Model {
                 $data_log['lg_admin_name'] = $data['admin_name'];
 
                 $data_pd['available_predeposit'] = ['exp','available_predeposit+'.$data['amount']];
-                $data_pd['freeze_predeposit'] = ['exp','freeze_predeposit-'.$data['amount']];
                 $dive_pd['available_predeposit'] = ['add' => $data['amount']];
-                $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+
+                if (!$fRefill) {
+                    $data_pd['freeze_predeposit'] = ['exp', 'freeze_predeposit-' . $data['amount']];
+                    $dive_pd['freeze_predeposit'] = ['reduce' => $data['amount']];
+                }
+
 
                 $data_msg['av_amount'] = $data['amount'];
                 $data_msg['freeze_amount'] = -$data['amount'];