Merge branch 'develop' into feature/app_dev

* develop:
  sys config upgrade
  sys config upgrade

# Conflicts:
#	go/gopath/src/fohow.com/apps/helpers/benefit_helper.go
#	go/gopath/src/fohow.com/routers/routes.go

go/gopath/src/fohow.com/apps/controllers/sys_controller/init.go

@@ -0,0 +1,32 @@
+package sys_controller
+
+import (
+	// "fmt"
+	// "os"
+	// "net/url"
+	// "strings"
+
+	// "github.com/astaxie/beego"
+	"github.com/astaxie/beego/context"
+	// "github.com/go-wkhtmltoimage"
+	// "github.com/skip2/go-qrcode"
+
+	"fohow.com/apps"
+)
+
+var (
+	//需要校验用户登录的Action
+	exceptCheckUserLoginAction   = []string{""}
+	exceptCheckWxUserLoginAction = []string{""}
+)
+
+type SysController struct {
+	apps.BaseController
+}
+
+func (self *SysController) Init(ctx *context.Context, controllerName, actionName string, app interface{}) {
+	// beego.BeeLogger.Info("invote controller Init func")
+	self.BaseController.Init(ctx, controllerName, actionName, app)
+	self.ExceptCheckUserLoginAction = exceptCheckUserLoginAction
+	self.ExceptCheckWxUserLoginAction = exceptCheckWxUserLoginAction
+}

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

@@ -0,0 +1,31 @@
+package sys_controller
+
+import (
+	// "github.com/astaxie/beego"
+	// "github.com/astaxie/beego/context"
+
+	"fohow.com/apps"
+	"fohow.com/apps/models/sys_config"
+
+	"fohow.com/apps/models/user_model"
+)
+
+//获取当前会员申店配置金额
+func (self *SysController) GetCurApplyInfo() {
+	type ApplyInfo struct {
+		Total int64 `orm:"-" json:"total"` //余额，单位分
+	}
+	wxUId := self.GetCurrentWxUserId()
+	wxUser := user_model.GetWxUserById(wxUId, true)
+	if wxUser == nil {
+		self.ReturnError(403, apps.UserNeedLogin, "", nil)
+	}
+	applyTotal := sys_config.GetUserApply()
+	if wxUser.Rank >= 1 {
+		applyTotal = sys_config.GetAgentApply()
+	}
+	info := new(ApplyInfo)
+	info.Total = applyTotal
+	self.Data["json"] = info
+	self.ServeJSON()
+}

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

@@ -40,7 +40,7 @@ func NewSendInviterBenefit(wxUser *user_model.WxUser, orderId, source string) {
 
 		if benefitWxUser != nil {
 			//发放群主收益，（微信支付金额-运费）>0，按（微信支付金额-运费）*20%给上级代理返佣金
-			be_total := float64(productOrder.PaiedPrice-productOrder.Freight) * float64(sys_config.GetCashAward()/int64(100))
+			be_total := float64(productOrder.PaiedPrice-productOrder.Freight) * (float64(sys_config.GetCashAward()) / float64(100))
 			count := int64(math.Floor(be_total + 0.5))
 
 			//beego.BeeLogger.Warn("count %d", count)

go/gopath/src/fohow.com/routers/routes.go

@@ -3,6 +3,7 @@ package routers
 import (
 	"fohow.com/apps/controllers/cent_controller"
 	"fohow.com/apps/controllers/live_controller"
+	"fohow.com/apps/controllers/sys_controller"
 	"fohow.com/apps/controllers/test_controller"
 	// "fohow.com/apps"
 	"github.com/astaxie/beego"
@@ -344,6 +345,10 @@ func init() {
 	//审核代理申请记录
 	beego.Router("/v1/user/com_agent/:id", &user_controller.UserController{}, "get:ComAgentApplication")
 
+	//----------------系统配置管理-------------------
+	//获取当前用户申请店铺金额
+	beego.Router("/v1/sys_config/apply_total", &sys_controller.SysController{}, "get:GetCurApplyInfo")
+
 	//----------------app接口相关-------------------
 	//重置密码
 	beego.Router("/v1/pwd/reset", &permit_controller.PermitController{}, "post:ResetPwd")