Browse Source

sys config upgrade

abiao 4 years ago
parent
commit
43c3b6d6c0

+ 4 - 1
go/gopath/src/fohow.com/apps/models/sys_config/init.go

@@ -3,5 +3,8 @@ package sys_config
 import "github.com/astaxie/beego/orm"
 
 func init() {
-	orm.RegisterModel(new(SysConfig))
+	orm.RegisterModel(
+		new(SysConfig),
+		new(PayConfig),
+	)
 }

+ 20 - 8
go/gopath/src/fohow.com/apps/models/sys_config/sys_config.go

@@ -24,6 +24,7 @@ const (
 	CODE_FOHOW_OUBIAO     = "oubiao"
 	CODE_FOHOW            = "fohow"
 	sys_configs_tablename = "sys_configs"
+	pay_configs_tablename = "pay_configs"
 )
 
 type SysConfig struct {
@@ -41,6 +42,18 @@ func (self *SysConfig) TableName() string {
 	return sys_configs_tablename
 }
 
+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 GetBuyCash() int64 {
 	SysConfig := &SysConfig{}
@@ -208,24 +221,23 @@ func GetAgentAward() int64 {
 
 //根据部门获取收款商户
 func GetPayConfigByDepart(depart int64, useCache bool) string {
-
-	k := fmt.Sprintf("sys_config_model.depart(%d)", depart)
+	k := fmt.Sprintf("pay_model.GetPayConfigByDepart.depart(%d)", depart)
 	if useCache {
-		if s, ok := cache.Cache.Get(k).(*SysConfig); ok {
-			return s.CodeValue
+		if s, ok := cache.Cache.Get(k).(*PayConfig); ok {
+			return s.PayCode
 		}
 	}
 
-	item := new(SysConfig)
+	item := new(PayConfig)
 	o := orm.NewOrm()
-	err := o.QueryTable(item).Filter("depart_record_id", depart).OrderBy("-id").Limit(1).One(item)
+	err := o.QueryTable(item).Filter("depart", depart).OrderBy("-id").Limit(1).One(item)
 	if err != nil {
-		beego.BeeLogger.Info("sys_config_model.GetPayConfigByDepart.depart(%d) err[%s]", depart, err)
+		beego.BeeLogger.Info("pay_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
+	return item.PayCode
 }