充值免收手续费 - 3

go/gopath/src/fohow.com/apps/controllers/balance_controller/balance_controller.go

@@ -227,8 +227,12 @@ func (self *BalanceController) TakeCash() {
 		amount = WX_TAKE_CASH_AMOUNT_LIMIT_MAX
 	}
 
+	feeTotal := float64(0)
+	fee := int64(0)
+
 	freeAmount := int64(0)
 	feeAmount := int64(0) //假如提现 100，免额 50
+
 	if freeFeiCash > 0 {
 		if freeFeiCash < amount {
 			freeAmount = freeFeiCash         // 用掉的额度
@@ -236,15 +240,18 @@ func (self *BalanceController) TakeCash() {
 		} else {
 			freeAmount = amount //用掉的额度
 		}
+		//处理提现手续费
+		feeTotal = float64(feeAmount) * (float64(sys_config.GetTakeCashTax())) / float64(100)
+		fee = int64(math.Floor(feeTotal + 0.5))
+	} else {
+		//处理提现手续费
+		feeTotal = float64(amount) * (float64(sys_config.GetTakeCashTax())) / float64(100)
+		fee = int64(math.Floor(feeTotal + 0.5))
 	}
 
 	takeCashLock.Lock()
 	defer takeCashLock.Unlock()
 
-	//处理提现手续费
-	feeTotal := float64(feeAmount) * (float64(sys_config.GetTakeCashTax())) / float64(100)
-	fee := int64(math.Floor(feeTotal + 0.5))
-
 	o := new(balance_model.TakeCashOrder).Create(wxUser.Id, amount, feeAmount, freeAmount)
 	if o != nil {
 		new(balance_model.CashBalance).Create(wxUser.Id, -amount, balance_model.CASH_SOURCE_TAKE_CASH,