Prechádzať zdrojové kódy

修改判断,增加复效大小判断

zxiansheng 3 rokov pred
rodič
commit
c7e277b9d5
1 zmenil súbory, kde vykonal 5 pridanie a 3 odobranie
  1. 5 3
      common/models/forms/TransferForm.php

+ 5 - 3
common/models/forms/TransferForm.php

@@ -207,7 +207,9 @@ class TransferForm extends Model {
         // 获取当前用户的可用金额
         if( $this->type == self::BALANCE_TO_BALANCE ) {
             $haveBalance = Cash::getAvailableBalance($this->_fromUserInfo['ID']);
-        }else {
+        }else if ($this->type == self::POINT_TO_BALANCE) {
+            $haveBalance = Balance::getBalanceReconsumePoints($this->_fromUserInfo['ID']);
+        } else {
             $haveBalance = Balance::getAvailableBalance($this->_fromUserInfo['ID']);
         }
         if ($this->amount > $haveBalance) {
@@ -358,7 +360,7 @@ class TransferForm extends Model {
                     [
                         'TRANSFER_SN' => $model->TRANSFER_SN, 
                         'DEAL_TYPE_ID' => DealType::TRANSFER_OUT, 
-                        'REMARK' => 'To:' . $this->_toUserInfo['USER_NAME'] . '' . $this->remark
+                        'REMARK' => 'To:' . $this->_toUserInfo['USER_NAME'] . ',' . $this->remark
                     ]
                 );
                 // 增加余额
@@ -368,7 +370,7 @@ class TransferForm extends Model {
                     [
                         'TRANSFER_SN' => $model->TRANSFER_SN,
                         'DEAL_TYPE_ID' => DealType::TRANSFER_IN, 
-                        'REMARK' => 'From:' . $this->_fromUserInfo['USER_NAME'] . '' . $this->remark
+                        'REMARK' => 'From:' . $this->_fromUserInfo['USER_NAME'] . ',' . $this->remark
                     ]
                 );
             } else {