Преглед изворни кода

Merge branch 'develop' into feature/app_dev

* develop:
  更改分佣计算规则
abiao пре 4 година
родитељ
комит
c958a3208b
1 измењених фајлова са 5 додато и 7 уклоњено
  1. 5 7
      go/gopath/src/fohow.com/apps/helpers/benefit_helper.go

+ 5 - 7
go/gopath/src/fohow.com/apps/helpers/benefit_helper.go

@@ -7,21 +7,19 @@ import (
 	"fohow.com/apps/models/sys_config"
 	"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
-	specialDepartStr := beego.AppConfig.String("SpecialDepart")
-	specialDeparts := strings.Split(specialDepartStr, ",")
-	departUser := fmt.Sprintf("%d", wxUser.Depart)
-	contain := tool.StringsContains(specialDeparts, departUser)
+	//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) && contain >= 0 {
+	if wxUser.ShowInviteMode == int64(1) {
 		benefitWxUser = wxUser
 	} else {
 		//20.12.01 新规--(微信支付金额-运费)>0,按(微信支付金额-运费)*20%给上级代理返佣金(代理本人下订单,也是返给上级代理)