three depart edit

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

@@ -125,8 +125,9 @@ func (self *BalanceController) GetCashBalanceList() {
 //现金账户信息
 func (self *BalanceController) GetCashBalanceInfo() {
 	type BalanceInfo struct {
-		Available int64 `orm:"-" json:"available"` //对应页面上可提现余额，单位分，进账+出账
-		Total     int64 `orm:"-" json:"total"`     //对应页面上累积收入，单位分，只算进账
+		Available   int64 `orm:"-" json:"available"`    //对应页面上可提现余额，单位分，进账+出账
+		Total       int64 `orm:"-" json:"total"`        //对应页面上累积收入，单位分，只算进账
+		CanTransfer bool  `orm:"-" json:"can_transfer"` //是否可转提货券
 	}
 	wxUser := self.GetCurrentWxUser(true)
 	if wxUser == nil {
@@ -137,7 +138,15 @@ 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 {
+		info.CanTransfer = false
+	}
 	self.Data["json"] = info
 	self.ServeJSON()
 }
@@ -299,6 +308,16 @@ 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
+	}
+	//三部会员禁止转提货券
+	if wxUser.Depart == specialDepart {
+		self.ReturnError(403, apps.NoExist, "", nil)
+	}
+
 	canExtract := balance_model.GetCashTotalBalance(wxUser.Id)
 
 	//余额不足

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

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

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

@@ -40,8 +40,8 @@ func PatchRechargeBalance(oId, totalFee int64, transactionId string) {
 		NewSendInviterBenefit(wxUser, order.OrderId, user_model.BALANCE_BENEFIT)
 	}
 	if totalFee >= base_config.GetBuyCash() && wxUser.ShowInviteMode != 1 {
-		//升级群主
-		UpdateIntroUser(wxUser)
+		//升级群主---0317手动升级群主
+		//UpdateIntroUser(wxUser)
 	}
 
 	beego.BeeLogger.Warn("*******PatchRechargeBalance End oId:%d", oId)

go/gopath/src/fohow.com/conf/app.conf

@@ -103,6 +103,9 @@ BindingWxPhoneKey = "1234567890123456"
 # 支付时长 10800
 PayTime = 600
 
+#佣金计算特殊处理
+SpecialDepart = 3
+
 #微信支付、企业付款证书
 #小程序商户号证书
 MchCertFile= "/opt/wxpay/fohow_wx/apiclient_cert.pem"
@@ -219,6 +222,9 @@ BindingWxPhoneKey = "fd85930e4941d780"
 # 支付时长
 PayTime = 86400
 
+#佣金计算特殊处理
+SpecialDepart = 20
+
 #微信支付、企业付款证书
 #小程序商户号证书
 MchCertFile= "/opt/wxpay/fohow_wx/apiclient_cert.pem"