Merge branch 'master' into develop

* master:
  special depart add 29

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

@@ -3,7 +3,9 @@ package balance_controller
 import (
 	"fmt"
 	"fohow.com/libs/lib_redis"
+	"fohow.com/libs/tool"
 	"github.com/astaxie/beego"
+	"strings"
 
 	// "crypto/md5"
 	// "encoding/hex"
@@ -139,12 +141,13 @@ func (self *BalanceController) GetCashBalanceInfo() {
 	info.Available = balance_model.GetCashTotalBalance(wxUser.Id)
 	info.Total = balance_model.GetCashEnterBalance(wxUser.Id)
 	info.CanTransfer = true
-	specialDepart, err := beego.AppConfig.Int64("SpecialDepart")
-	if err != nil {
-		beego.BeeLogger.Error("%s", err)
-		return
-	}
-	if wxUser.Depart == specialDepart {
+	specialDepartStr := beego.AppConfig.String("SpecialDepart")
+
+	specialDeparts := strings.Split(specialDepartStr, ".")
+	departUser := fmt.Sprintf("%d", wxUser.Depart)
+	contain := tool.StringsContains(specialDeparts, departUser)
+
+	if contain >= 0 {
 		info.CanTransfer = false
 	}
 	self.Data["json"] = info
@@ -308,13 +311,13 @@ func (self *BalanceController) TransferToBalance() {
 		self.ReturnError(403, apps.TakeCashAmountInvalid, "", nil)
 	}
 
-	specialDepart, err := beego.AppConfig.Int64("SpecialDepart")
-	if err != nil {
-		beego.BeeLogger.Error("%s", err)
-		return
-	}
+	specialDepartStr := beego.AppConfig.String("SpecialDepart")
+	specialDeparts := strings.Split(specialDepartStr, ".")
+	departUser := fmt.Sprintf("%d", wxUser.Depart)
+	contain := tool.StringsContains(specialDeparts, departUser)
+
 	//三部会员禁止转提货券
-	if wxUser.Depart == specialDepart {
+	if contain >= 0 {
 		self.ReturnError(403, apps.NoExist, "", nil)
 	}
 

go/gopath/src/fohow.com/apps/helpers/benefit_helper.go

@@ -6,20 +6,22 @@ import (
 	"fohow.com/apps/models/base_config"
 	"fohow.com/apps/models/order_model"
 	"fohow.com/apps/models/user_model"
+	"fohow.com/libs/tool"
 	"github.com/astaxie/beego"
 	"math"
+	"strings"
 )
 
 func NewSendInviterBenefit(wxUser *user_model.WxUser, orderId, source string) {
 
 	//三部代理--佣金计入本人账户 0317
-	specialDepart, err := beego.AppConfig.Int64("SpecialDepart")
-	if err != nil {
-		beego.BeeLogger.Error("%s", err)
-		return
-	}
+	specialDepartStr := beego.AppConfig.String("SpecialDepart")
+	specialDeparts := strings.Split(specialDepartStr, ".")
+	departUser := fmt.Sprintf("%d", wxUser.Depart)
+	contain := tool.StringsContains(specialDeparts, departUser)
+
 	var benefitWxUser *user_model.WxUser
-	if wxUser.ShowInviteMode == int64(1) && wxUser.Depart == specialDepart {
+	if wxUser.ShowInviteMode == int64(1) && contain >= 0 {
 		benefitWxUser = wxUser
 	} else {
 		//20.12.01 新规--（微信支付金额-运费）>0，按（微信支付金额-运费）*20%给上级代理返佣金（代理本人下订单，也是返给上级代理）

go/gopath/src/fohow.com/apps/helpers/recharge_helper.go

@@ -3,7 +3,9 @@ package helpers
 import (
 	"fmt"
 	"fohow.com/apps/models/base_config"
+	"fohow.com/libs/tool"
 	"github.com/astaxie/beego"
+	"strings"
 	"time"
 
 	"fohow.com/apps/models/balance_model"
@@ -40,13 +42,19 @@ func PatchRechargeBalance(oId, totalFee int64, transactionId string) {
 		NewSendInviterBenefit(wxUser, order.OrderId, user_model.BALANCE_BENEFIT)
 	}
 	if totalFee >= base_config.GetBuyCash() && wxUser.ShowInviteMode != 1 {
+
 		//升级群主---0317手动升级群主
-		specialDepart, err := beego.AppConfig.Int64("SpecialDepart")
-		if err != nil {
-			beego.BeeLogger.Error("%s", err)
-			return
-		}
-		if wxUser.Depart != specialDepart {
+		specialDepartStr := beego.AppConfig.String("SpecialDepart")
+		specialDeparts := strings.Split(specialDepartStr, ".")
+		departUser := fmt.Sprintf("%d", wxUser.Depart)
+		contain := tool.StringsContains(specialDeparts, departUser)
+
+		/*		specialDepart, err := beego.AppConfig.Int64("SpecialDepart")
+				if err != nil {
+					beego.BeeLogger.Error("%s", err)
+					return
+				}*/
+		if contain >= 0 {
 			UpdateIntroUser(wxUser)
 		}
 	}

go/gopath/src/fohow.com/libs/tool/string.go

@@ -74,3 +74,15 @@ func ConvertNumToCny(num float64) string {
 	}
 	return str
 }
+
+//字符串组是否包含某字符串
+func StringsContains(array []string, val string) (index int) {
+	index = -1
+	for i := 0; i < len(array); i++ {
+		if array[i] == val {
+			index = i
+			return index
+		}
+	}
+	return index
+}