Merge branch 'develop' into feature/app_dev

* develop:
  sys config upgrade
  sys config upgrade
  sys config upgrade
  sys config upgrade
  sys config upgrade
  sys config upgrade

go/gopath/src/fohow.com/apps/controllers/cron_controller/sync_balance.go

@@ -3,7 +3,7 @@ package cron_controller
 import (
 	"crypto/md5"
 	"fmt"
-	"fohow.com/apps/models/pay_model"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/lib_redis"
 	"github.com/go-redis/redis"
 	"io"
@@ -61,7 +61,7 @@ func takeCash() {
 		} else {
 			check_state = wx_mp.PAY_NO_CHECK
 		}*/
-		payCode := pay_model.GetPayConfigByDepart(wxUser.Depart, true)
+		payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 		ret := wx_mp.Transfers(wxUser.Openid, item.Count, item.OrderId, check_state, user.RealName, payCode, "提现")
 		if ret["result_code"] == wx_mp.PAY_SUCCESS {
 			item.State = 1
@@ -123,7 +123,7 @@ func autoTakeCash() {
 		}
 		var check_state string
 		check_state = wx_mp.PAY_NO_CHECK
-		payCode := pay_model.GetPayConfigByDepart(wxUser.Depart, true)
+		payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 
 		ret := wx_mp.Transfers(wxUser.Openid, cashRecord.Count, cashRecord.OrderId, check_state, user.RealName, payCode, "提现")
 		if ret["result_code"] == wx_mp.PAY_SUCCESS {

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

@@ -2,8 +2,8 @@ package order_controller
 
 import (
 	"fmt"
-	"fohow.com/apps/models/base_config"
 	"fohow.com/apps/models/cent_model"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/lib_redis"
 	// "fmt"
 	"strconv"
@@ -113,8 +113,8 @@ func (self *OrderController) Create() {
 	if wxUId == 76 {
 		totalPrice = 1
 	}
-	freight := base_config.GetFreight()
-	if totalPrice >= base_config.GetOrderLimit() {
+	freight := sys_config.GetFreight()
+	if totalPrice >= sys_config.GetOrderLimit() {
 		freight = int64(0)
 	}
 
@@ -246,8 +246,8 @@ func (self *OrderController) MultipleCreate() {
 		totalPrice += product.Price * cNums
 		CreateOrderDetails(product, order, cNums, wxUser.Depart)
 	}
-	freight := base_config.GetFreight()
-	if totalPrice >= base_config.GetOrderLimit() {
+	freight := sys_config.GetFreight()
+	if totalPrice >= sys_config.GetOrderLimit() {
 		freight = int64(0)
 	}
 	order.TotalPrice = totalPrice
@@ -329,8 +329,8 @@ func (self *OrderController) MultShopCreate() {
 		totalPrice += product.Price * cNums
 		CreateOrderDetails(product, order, cNums, wxUser.Depart)
 	}
-	freight := base_config.GetFreight()
-	if totalPrice >= base_config.GetOrderLimit() {
+	freight := sys_config.GetFreight()
+	if totalPrice >= sys_config.GetOrderLimit() {
 		freight = int64(0)
 	}
 	order.TotalPrice = totalPrice
@@ -407,9 +407,9 @@ func (self *OrderController) MultCentCreate() {
 	}
 
 	//订单合法性判断
-	freight := base_config.GetFreight()
-	if totalPrice < base_config.GetOrderLimit() {
-		self.ReturnError(403, []string{apps.OrderNotEnough[0], fmt.Sprintf("订单金额不能低于%d积分", base_config.GetOrderLimit()/int64(100))}, "", nil)
+	freight := sys_config.GetFreight()
+	if totalPrice < sys_config.GetOrderLimit() {
+		self.ReturnError(403, []string{apps.OrderNotEnough[0], fmt.Sprintf("订单金额不能低于%d积分", sys_config.GetOrderLimit()/int64(100))}, "", nil)
 	} else {
 		freight = int64(0)
 	}

go/gopath/src/fohow.com/apps/controllers/pay_controller/after_pay_controller.go

@@ -15,6 +15,7 @@ import (
 	"fohow.com/apps/models/balance_model"
 	"fohow.com/apps/models/order_model"
 	"fohow.com/apps/models/pay_model"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/wx_mp"
 	"github.com/astaxie/beego"
 	"strconv"
@@ -84,7 +85,7 @@ func (self *PayController) wxPayBalanceAsync() {
 
 	orderId := strings.Split(params.OutTradeNO, "_")[0]
 	order := balance_model.GetBalanceOrderByOId(orderId, false)
-	payCode := pay_model.GetPayConfigByDepart(order.Depart, true)
+	payCode := sys_config.GetPayConfigByDepart(order.Depart, true)
 	// 签名校验参数
 	if !wx_mp.VerifyPayResult(params, payCode) {
 		beego.BeeLogger.Error("VerifyPayResult not pass")
@@ -138,7 +139,7 @@ func (self *PayController) wxPayExchangeAsync() {
 	}
 	orderId := strings.Split(params.OutTradeNO, "_")[0]
 	order := order_model.GetOrderById(orderId, false)
-	payCode := pay_model.GetPayConfigByDepart(order.Depart, true)
+	payCode := sys_config.GetPayConfigByDepart(order.Depart, true)
 	// 签名校验参数
 	//&& !wx_mp.VerifyGzhPayResult(params, payCode)
 	if !wx_mp.VerifyPayResult(params, payCode) {
@@ -236,7 +237,7 @@ func (self *PayController) wxPayCashczAsync() {
 
 	orderId := strings.Split(params.OutTradeNO, "_")[0]
 	order := balance_model.GetRechargeCashOrderByOId(orderId, false)
-	payCode := pay_model.GetPayConfigByDepart(order.Id, true)
+	payCode := sys_config.GetPayConfigByDepart(order.Id, true)
 	// 签名校验参数
 	if !wx_mp.VerifyPayResult(params, payCode) {
 		beego.BeeLogger.Error("wxPayCashczAsync.VerifyPayResult not pass")

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_balance_controller.go

@@ -2,7 +2,7 @@ package pay_controller
 
 import (
 	"fmt"
-	"fohow.com/apps/models/pay_model"
+	"fohow.com/apps/models/sys_config"
 
 	"github.com/astaxie/beego"
 
@@ -38,7 +38,7 @@ func (self *PayController) wxPayBalance(orderId string) {
 	}
 	totalPrice := balanceOrder.PaiedPrice
 	//获取paycode
-	payCode := pay_model.GetPayConfigByDepart(wxUser.Depart, true)
+	payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 	beego.BeeLogger.Debug("pay.total_price(%d)", totalPrice)
 	//获取预支付信息/v1/pay/:target:string/async/:payway:string
 	notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), BALANCE_TARGET, balance_model.PAY_WAY_TYPE_SERVICE_WXPAY) // balance "service_wxpay"

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_cashcz_controller.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"fohow.com/apps"
 	"fohow.com/apps/models/balance_model"
-	"fohow.com/apps/models/pay_model"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/wx_mp"
 	"github.com/astaxie/beego"
 )
@@ -38,7 +38,7 @@ func (self *PayController) wxPayCashcz(orderId string) {
 	//获取预支付信息/v1/pay/:target:string/async/:payway:string
 	notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), CASH_TARGET, balance_model.PAY_WAY_TYPE_RECHARGE_WXPAY) // rechargeCashOrder "recharge_wxpay"
 	body := "FOHOW玖玖-余额充值"
-	payCode := pay_model.GetPayConfigByDepart(wxUser.Depart, true)
+	payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 	payData := wx_mp.GetPayData(wxUser.Openid, reCashOrder.OrderId, reCashOrder.TotalPrice, body, notifyUrl, self.Ctx.Input.IP(), payCode)
 
 	//返回数据

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -2,8 +2,8 @@ package pay_controller
 
 import (
 	"fmt"
-	"fohow.com/apps/models/base_config"
 	"fohow.com/apps/models/cent_model"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/lib_redis"
 
 	// "net/url"
@@ -149,8 +149,8 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 		totalCoupon := int64(0)
 		userLeftBalanceCount := balance_model.GetUserTotalBalance(wxUId)
 		tp := order.TotalPrice
-		freight := base_config.GetFreight()
-		if tp >= base_config.GetOrderLimit() {
+		freight := sys_config.GetFreight()
+		if tp >= sys_config.GetOrderLimit() {
 			freight = int64(0)
 		}
 		tp += freight
@@ -203,15 +203,15 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 			order.Source = source
 			order.Save()
 			if order.Source == order_model.SOURCE_XCX { //小程序微信支付
-				freight := base_config.GetFreight()
-				if order.TotalPrice >= base_config.GetOrderLimit() {
+				freight := sys_config.GetFreight()
+				if order.TotalPrice >= sys_config.GetOrderLimit() {
 					freight = int64(0)
 				}
 				order.TotalPrice += freight
 				notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), EXCHANGE_TARGET, pay_model.PAYWAY_WEIXINPAY)
 				body := fmt.Sprintf("FOHOW玖玖-购买商品")
 				//获取paycode
-				payCode := pay_model.GetPayConfigByDepart(wxUser.Depart, true)
+				payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 				payData := wx_mp.GetPayData(wxUser.Openid, order.OrderId, order.PaiedPrice, body, notifyUrl, self.Ctx.Input.IP(), payCode)
 
 				//返回数据
@@ -248,7 +248,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 				if wxGzh == nil {
 					self.ReturnError(403, apps.NoExist, "", nil)
 				}
-				payCode := pay_model.GetPayConfigByDepart(wxUser.Depart, true)
+				payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 				payData := wx_mp.GetPayData(wxGzh.GzhOpenId, order.OrderId, order.PaiedPrice, body, notifyUrl, self.Ctx.Input.IP(), payCode)
 
 				//返回数据
@@ -267,7 +267,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 
 			notifyUrl := fmt.Sprintf("%s/v1/pay/%s/async/%s", beego.AppConfig.String("ApiHost"), EXCHANGE_TARGET, pay_model.PAYWAY_WEIXINPAY)
 			body := fmt.Sprintf("FOHOW玖玖-购买商品")
-			payCode := pay_model.GetPayConfigByDepart(wxUser.Depart, true)
+			payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 			payData := wx_mp.GetPayData(wxUser.Openid, order.OrderId, order.PaiedPrice, body, notifyUrl, self.Ctx.Input.IP(), payCode)
 
 			//返回数据
@@ -285,7 +285,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 			if wxGzh == nil {
 				self.ReturnError(403, apps.NoExist, "", nil)
 			}
-			payCode := pay_model.GetPayConfigByDepart(wxUser.Depart, true)
+			payCode := sys_config.GetPayConfigByDepart(wxUser.Depart, true)
 
 			//payData := wx_mp.GetPayData(wxGzh.GzhOpenId, order.OrderId , order.TotalPrice, body,notifyUrl, self.Ctx.Input.IP())
 			payData := wx_mp.GetPayData(wxGzh.GzhOpenId, order.OrderId, order.PaiedPrice, body, notifyUrl, self.Ctx.Input.IP(), payCode)
@@ -391,8 +391,8 @@ func (self *PayController) payCentExchange(oId, returnUrl, source, remark string
 	//直接抵扣积分，积分不够则报错
 	userLeftCent := cent_model.GetCentTotalBalance(wxUId)
 	tp := order.TotalPrice
-	freight := base_config.GetFreight()
-	if tp >= base_config.GetOrderLimit() {
+	freight := sys_config.GetFreight()
+	if tp >= sys_config.GetOrderLimit() {
 		freight = int64(0)
 	}
 	tp += freight

go/gopath/src/fohow.com/apps/controllers/pay_controller/recharge_controller.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"fohow.com/apps"
 	"fohow.com/apps/models/balance_model"
-	"fohow.com/apps/models/base_config"
+	"fohow.com/apps/models/sys_config"
 	"github.com/astaxie/beego"
 	"strings"
 )
@@ -14,7 +14,7 @@ func (self *PayController) CreateBalanceOrder() {
 
 	//校验兑换提货券数量，为正整数
 	//count, _ := self.GetInt64("count") //兑换数量
-	count := base_config.GetBuyCash()
+	count := sys_config.GetBuyCash()
 
 	if count <= 0 {
 		self.ReturnError(403, apps.RechargeCountWrong, "", nil)
@@ -37,8 +37,8 @@ func (self *PayController) CreateBalanceOrder() {
 		self.ReturnError(403, apps.PayWayNoMatch, "", nil)
 	}
 	tp := int64(0)
-	if count == base_config.GetBuyCash() {
-		tp = base_config.GetSendCash()
+	if count == sys_config.GetBuyCash() {
+		tp = sys_config.GetSendCash()
 	} else {
 		tp = count
 	}

go/gopath/src/fohow.com/apps/controllers/railsadmin_controller/order_refund_controller.go

@@ -5,7 +5,7 @@ import (
 	"fohow.com/apps"
 	"fohow.com/apps/models/balance_model"
 	"fohow.com/apps/models/order_model"
-	"fohow.com/apps/models/pay_model"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/wx_mp"
 	"math/rand"
 	"strings"
@@ -81,7 +81,7 @@ func (self *RailsadminController) OrderRefund() {
 			outTradeNo := fmt.Sprintf("%s-%d", refund.OrderId, refund.Id)
 			outRefundNo := createOrderId("refund")
 			remark := fmt.Sprintf("%s%s", refund.OrderId, "退款")
-			payCode := pay_model.GetPayConfigByDepart(o.Depart, true)
+			payCode := sys_config.GetPayConfigByDepart(o.Depart, true)
 			payData := wx_mp.GetRefundDataPay(outTradeNo, outRefundNo, refund.RefundFee, o.TradeNo, remark, payCode)
 			if payData != nil {
 				if payData["return_code"] == "SUCCESS" {

go/gopath/src/fohow.com/apps/controllers/railsadmin_controller/update_shop_application.go

@@ -5,7 +5,7 @@ import (
 	"fohow.com/apps"
 	"fohow.com/apps/helpers"
 	"fohow.com/apps/models/balance_model"
-	"fohow.com/apps/models/base_config"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/apps/models/user_model"
 	"fohow.com/cache"
 	"github.com/astaxie/beego"
@@ -63,9 +63,9 @@ func ApplySuccessInviterBenefit(wxUser *user_model.WxUser, shopId int64, source
 	}
 	//本人充值16800--发放4200提货券
 	rId := fmt.Sprintf("shop-apply-%d", shopId)
-	c := base_config.GetUserCash()
-	if shopApply.Total == base_config.GetAgentApply() {
-		c = base_config.GetAgentCash()
+	c := sys_config.GetUserCash()
+	if shopApply.Total == sys_config.GetAgentApply() {
+		c = sys_config.GetAgentCash()
 	}
 	benefitWxUser := GetInviter(wxUser)
 	if benefitWxUser == nil || benefitWxUser.Id == int64(1) {
@@ -85,10 +85,10 @@ func ApplySuccessInviterBenefit(wxUser *user_model.WxUser, shopId int64, source
 
 	//发放佣金  13800-4500 16800-5000
 	count := int64(0)
-	if shopApply.Total == base_config.GetUserApply() {
-		count = base_config.GetUserAward()
+	if shopApply.Total == sys_config.GetUserApply() {
+		count = sys_config.GetUserAward()
 	} else {
-		count = base_config.GetAgentAward()
+		count = sys_config.GetAgentAward()
 	}
 	if count > int64(0) {
 		remark := fmt.Sprintf("%s%s", wxUser.Nickname, "店长申请成功")

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

@@ -2,8 +2,8 @@ package user_controller
 
 import (
 	"fmt"
-	"fohow.com/apps/models/base_config"
 	"fohow.com/apps/models/cent_model"
+	"fohow.com/apps/models/sys_config"
 	"strconv"
 
 	// "strconv"
@@ -411,9 +411,9 @@ func (self *UserController) ShopApplication() {
 	if wxUser.Rank > user_model.WX_USER_RANK_ONE {
 		self.ReturnError(403, apps.AlreadyShop, "", nil)
 	}
-	total := base_config.GetUserApply()
+	total := sys_config.GetUserApply()
 	if wxUser.Rank == user_model.WX_USER_RANK_ONE {
-		total = base_config.GetAgentApply()
+		total = sys_config.GetAgentApply()
 	}
 	k := fmt.Sprintf("%s%s", sms_model.SHOP_APPLICATION, mobile)
 	if cacheCode, ok := cache.Cache.Get(k).(string); ok {

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

@@ -3,8 +3,8 @@ package helpers
 import (
 	"fmt"
 	"fohow.com/apps/models/balance_model"
-	"fohow.com/apps/models/base_config"
 	"fohow.com/apps/models/order_model"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/apps/models/user_model"
 	"fohow.com/libs/tool"
 	"github.com/astaxie/beego"
@@ -70,8 +70,8 @@ func NewSendInviterBenefit(wxUser *user_model.WxUser, orderId, source string) {
 		if benefitWxUser != nil {
 			count := int64(0)
 			//读取上级配置收益比例
-			if balanceOrder.PaiedPrice >= base_config.GetBuyCash() {
-				be_total := balanceOrder.PaiedPrice * base_config.GetCashAward()
+			if balanceOrder.PaiedPrice >= sys_config.GetBuyCash() {
+				be_total := balanceOrder.PaiedPrice * sys_config.GetCashAward()
 				count = be_total / int64(100)
 			}
 			if count > 0 {

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

@@ -2,7 +2,7 @@ package helpers
 
 import (
 	"fmt"
-	"fohow.com/apps/models/base_config"
+	"fohow.com/apps/models/sys_config"
 	"fohow.com/libs/tool"
 	"github.com/astaxie/beego"
 	"strings"
@@ -41,7 +41,7 @@ func PatchRechargeBalance(oId, totalFee int64, transactionId string) {
 	if wxUser != nil {
 		NewSendInviterBenefit(wxUser, order.OrderId, user_model.BALANCE_BENEFIT)
 	}
-	if totalFee >= base_config.GetBuyCash() && wxUser.ShowInviteMode != 1 {
+	if totalFee >= sys_config.GetBuyCash() && wxUser.ShowInviteMode != 1 {
 
 		//升级群主---0317手动升级群主
 		specialDepartStr := beego.AppConfig.String("SpecialDepart")

go/gopath/src/fohow.com/apps/models/base_config/base_config.go

@@ -1,167 +0,0 @@
-package base_config
-
-import (
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/orm"
-	"time"
-)
-
-const (
-	base_configs_tablename = "base_configs"
-)
-
-type BaseConfig struct {
-	Id         int64 `orm:"column(id);pk"                                       json:"id"` // int(11)
-	BuyCash    int64 `orm:"column(buy_cash)"                                    json:"-"`  // int(11)
-	SendCash   int64 `orm:"column(send_cash)"                                   json:"-"`  // int(11)
-	CashAward  int64 `orm:"column(cash_award)"                                  json:"-"`  // int(11)
-	OrderLimit int64 `orm:"column(order_limit)"                                 json:"-"`  // int(11)
-	Freight    int64 `orm:"column(freight)"                                     json:"-"`  // int(11)
-
-	UserApply int64 `orm:"column(user_apply)"                                   json:"-"` // int(11)
-	UserCash  int64 `orm:"column(user_cash)"                                    json:"-"` // int(11)
-	UserAward int64 `orm:"column(user_award)"                                   json:"-"` // int(11)
-
-	AgentApply int64 `orm:"column(agent_apply)"                                   json:"-"` // int(11)
-	AgentCash  int64 `orm:"column(agent_cash)"                                    json:"-"` // int(11)
-	AgentAward int64 `orm:"column(agent_award)"                                   json:"-"` // int(11)
-
-	CreatedAt time.Time `orm:"column(created_at);null;auto_now_add;type(datetime)" json:"-"` // datetime
-	UpdatedAt time.Time `orm:"column(updated_at);null;auto_now;type(datetime)"     json:"-"` // datetime
-}
-
-func (self *BaseConfig) TableName() string {
-	return base_configs_tablename
-}
-
-// 获取购券支付金额
-func GetBuyCash() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.BuyCash
-}
-
-// 购券实得金额
-func GetSendCash() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.SendCash
-}
-
-// 获取购券返佣
-func GetCashAward() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.CashAward
-}
-
-// 订单免运金额
-func GetOrderLimit() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.OrderLimit
-}
-
-// 获取购券支付金额
-func GetFreight() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.Freight
-}
-
-// 会员申店金额
-func GetUserApply() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.UserApply
-}
-
-// 会员申店反券
-func GetUserCash() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.UserCash
-}
-
-// 会员申店返佣
-func GetUserAward() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.UserAward
-}
-
-// 代理申店金额
-func GetAgentApply() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.AgentApply
-}
-
-// 代理申店反券
-func GetAgentCash() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.AgentCash
-}
-
-// 代理申店返佣
-func GetAgentAward() int64 {
-	baseConfig := &BaseConfig{}
-	if err := orm.NewOrm().QueryTable(baseConfig).Limit(1).One(baseConfig); err != nil {
-		beego.BeeLogger.Error("get BaseConfig by  err=%s", err)
-		baseConfig = nil
-		return int64(0)
-	}
-
-	return baseConfig.AgentAward
-}

go/gopath/src/fohow.com/apps/models/pay_model/init.go

@@ -1,15 +1,7 @@
 package pay_model
 
-import (
-	// "time"
-
-	// "github.com/astaxie/beego"
-	// "github.com/astaxie/beego/orm"
-	"github.com/astaxie/beego/orm"
-)
-
 func init() {
-	orm.RegisterModel(new(PayConfig))
+
 }
 
 const (

go/gopath/src/fohow.com/apps/models/pay_model/pay_config.go

@@ -1,57 +0,0 @@
-package pay_model
-
-import (
-	"fmt"
-	"fohow.com/cache"
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/orm"
-	"time"
-)
-
-const (
-	pay_configs_tablename = "pay_configs"
-)
-
-type PayConfig struct {
-	Id        int64     `orm:"column(id);pk"                                        json:"id"` // int(11)
-	PayCode   string    `orm:"column(pay_code)"                                    json:"-"`
-	Depart    int64     `orm:"column(depart)"                                      json:"-"`                     // int(11)
-	CreatedAt time.Time `orm:"column(created_at);null;auto_now_add;type(datetime)"  json:"created_at,omitempty"` // datetime
-	UpdatedAt time.Time `orm:"column(updated_at);null;auto_now;type(datetime)"      json:"updated_at,omitempty"` // datetime
-}
-
-func (self *PayConfig) TableName() string {
-	return pay_configs_tablename
-}
-
-func (self *PayConfig) Save() error {
-	if _, err := orm.NewOrm().Update(self); err != nil {
-		beego.BeeLogger.Error("Save PayConfig id=[%d] .err=[%s]", self.Id, err)
-		return err
-	}
-	return nil
-}
-
-//根据部门获取收款商户
-func GetPayConfigByDepart(depart int64, useCache bool) string {
-	payCode := "fohow"
-	k := fmt.Sprintf("pay_model.GetPayConfigByDepart.depart(%d)", depart)
-	if useCache {
-		if s, ok := cache.Cache.Get(k).(*PayConfig); ok {
-			return s.PayCode
-		}
-	}
-
-	item := new(PayConfig)
-	o := orm.NewOrm()
-	err := o.QueryTable(item).Filter("depart", depart).OrderBy("-id").Limit(1).One(item)
-	if err != nil {
-		beego.BeeLogger.Info("pay_model.GetPayConfigByDepart.depart(%d) err[%s]", depart, err)
-		return payCode
-	}
-
-	if item != nil {
-		cache.Cache.Put(k, item, 5*time.Minute)
-	}
-	return item.PayCode
-}

go/gopath/src/fohow.com/apps/models/base_config/init.go

@@ -1,7 +1,7 @@
-package base_config
+package sys_config
 
 import "github.com/astaxie/beego/orm"
 
 func init() {
-	orm.RegisterModel(new(BaseConfig))
+	orm.RegisterModel(new(SysConfig))
 }

go/gopath/src/fohow.com/apps/models/sys_config/sys_config.go

@@ -0,0 +1,231 @@
+package sys_config
+
+import (
+	"fmt"
+	"fohow.com/cache"
+	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/orm"
+	"strconv"
+	"time"
+)
+
+const (
+	CODE_BUY_CASH         = "BUY_CASH"
+	CODE_SEND_CASH        = "SEND_CASH"
+	CODE_CASH_AWARD       = "CASH_AWARD"
+	CODE_FREIGHT_LIMIT    = "FREIGHT_LIMIT"
+	CODE_FREIGHT          = "FREIGHT"
+	CODE_USER_SHOP_APPLY  = "USER_SHOP_APPLY"
+	CODE_USER_APPLY_RET   = "USER_APPLY_RET"
+	CODE_USER_APPLY_QUAN  = "USER_APPLY_QUAN"
+	CODE_AGENT_SHOP_APPLY = "AGENT_SHOP_APPLY"
+	CODE_AGENT_APPLY_RET  = "AGENT_APPLY_RET"
+	CODE_AGENT_APPLY_QUAN = "AGENT_APPLY_QUAN"
+	CODE_FOHOW_OUBIAO     = "oubiao"
+	CODE_FOHOW            = "fohow"
+	sys_configs_tablename = "sys_configs"
+)
+
+type SysConfig struct {
+	Id        int64     `orm:"column(id);pk"                              json:"id"`         // int(11)
+	Code      string    `orm:"column(code);null"                          json:"-"`          // varchar(64)
+	CodeType  int64     `orm:"column(config_type)"                        json:"-"`          // int(11)
+	CodeValue string    `orm:"column(code_value);null"                    json:"-"`          // varchar(64)
+	DepartId  int64     `orm:"column(depart_record_id)"                   json:"-"`          // int(11)
+	Sort      int64     `orm:"column(sort)"                               json:"-"`          // int(11)
+	CreatedAt time.Time `orm:"column(created_at);null;auto_now_add;type(datetime)" json:"-"` // datetime
+	UpdatedAt time.Time `orm:"column(updated_at);null;auto_now;type(datetime)"     json:"-"` // datetime
+}
+
+func (self *SysConfig) TableName() string {
+	return sys_configs_tablename
+}
+
+// 获取购券支付金额
+func GetBuyCash() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_BUY_CASH).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 购券实得金额
+func GetSendCash() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_SEND_CASH).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 获取购券返佣
+func GetCashAward() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_CASH_AWARD).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 订单免运金额
+func GetOrderLimit() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_FREIGHT_LIMIT).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 获取运费金额
+func GetFreight() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_FREIGHT).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 会员申店金额
+func GetUserApply() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_USER_SHOP_APPLY).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 会员申店反券
+func GetUserCash() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_USER_APPLY_QUAN).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 会员申店返佣
+func GetUserAward() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_USER_APPLY_RET).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 代理申店金额
+func GetAgentApply() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_AGENT_SHOP_APPLY).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 代理申店反券
+func GetAgentCash() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_AGENT_APPLY_QUAN).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+// 代理申店返佣
+func GetAgentAward() int64 {
+	SysConfig := &SysConfig{}
+	if err := orm.NewOrm().QueryTable(SysConfig).Filter("code", CODE_AGENT_APPLY_RET).Limit(1).One(SysConfig); err != nil {
+		beego.BeeLogger.Error("get SysConfig by  err=%s", err)
+		SysConfig = nil
+		return int64(0)
+	}
+	value, err := strconv.ParseInt(SysConfig.CodeValue, 10, 64)
+	if err != nil {
+		return int64(0)
+	}
+	return value
+}
+
+//根据部门获取收款商户
+func GetPayConfigByDepart(depart int64, useCache bool) string {
+
+	k := fmt.Sprintf("sys_config_model.depart(%d)", depart)
+	if useCache {
+		if s, ok := cache.Cache.Get(k).(*SysConfig); ok {
+			return s.CodeValue
+		}
+	}
+
+	item := new(SysConfig)
+	o := orm.NewOrm()
+	err := o.QueryTable(item).Filter("depart_record_id", depart).OrderBy("-id").Limit(1).One(item)
+	if err != nil {
+		beego.BeeLogger.Info("sys_config_model.GetPayConfigByDepart.depart(%d) err[%s]", depart, err)
+		return CODE_FOHOW
+	}
+
+	if item != nil {
+		cache.Cache.Put(k, item, 5*time.Minute)
+	}
+	return item.CodeValue
+}