ziwen 1 year ago
parent
commit
22d297d1a9

+ 5 - 5
controllers/eta_business/eta_business_menu.go

@@ -688,11 +688,11 @@ func (this *EtaBusinessMenuController) SystemApiConfig() {
 		br.Ret = 408
 		return
 	}
-	var relates []*eta_business.EtaBusinessMenuApiRelate
+	var relates []*eta_business.EtaBusinessConfigRelate
 	businessId, _ := this.GetInt("EtaBusinessId", 0)
 	var err error
 	if businessId > 0 {
-		relateOb := new(eta_business.EtaBusinessMenuApiRelate)
+		relateOb := new(eta_business.EtaBusinessConfigRelate)
 		cond := ` AND eta_business_id = ?`
 		pars := make([]interface{}, 0)
 		pars = append(pars, businessId)
@@ -739,10 +739,10 @@ func (this *EtaBusinessMenuController) SystemApiConfigSet() {
 		br.ErrMsg = "参数解析失败,Err:" + e.Error()
 		return
 	}
-	ob := new(eta_business.EtaBusinessMenuApiRelate)
-	items := make([]*eta_business.EtaBusinessMenuApiRelate, 0)
+	ob := new(eta_business.EtaBusinessConfigRelate)
+	items := make([]*eta_business.EtaBusinessConfigRelate, 0)
 	for _, v := range req.List {
-		t := new(eta_business.EtaBusinessMenuApiRelate)
+		t := new(eta_business.EtaBusinessConfigRelate)
 		t.ConfigCode = v.ConfigCode
 		t.ConfigValue = v.ConfigValue
 		t.EtaBusinessId = req.EtaBusinessId

+ 13 - 13
models/eta_business/eta_business_config_relate.go

@@ -6,24 +6,24 @@ import (
 	"strings"
 )
 
-// EtaBusinessMenuApiRelate ETA商家菜单api关联表
-type EtaBusinessMenuApiRelate struct {
+// EtaBusinessConfigRelate ETA商家菜单api关联表
+type EtaBusinessConfigRelate struct {
 	Id            int `orm:"column(id);pk"`
 	EtaBusinessId int `description:"商家ID"`
 	ConfigCode    string `description:"配置编码"`
 	ConfigValue   string `description:"配置值"`
 }
 
-func (m *EtaBusinessMenuApiRelate) TableName() string {
+func (m *EtaBusinessConfigRelate) TableName() string {
 	return "eta_business_menu_api_relate"
 }
 
-func (m *EtaBusinessMenuApiRelate) PrimaryId() string {
+func (m *EtaBusinessConfigRelate) PrimaryId() string {
 	return "id"
 }
 
 
-func (m *EtaBusinessMenuApiRelate) CreateMulti(businessId int, items []*EtaBusinessMenuApiRelate) (err error) {
+func (m *EtaBusinessConfigRelate) CreateMulti(businessId int, items []*EtaBusinessConfigRelate) (err error) {
 	if businessId == 0 {
 		return
 	}
@@ -52,35 +52,35 @@ func (m *EtaBusinessMenuApiRelate) CreateMulti(businessId int, items []*EtaBusin
 	return
 }
 
-func (m *EtaBusinessMenuApiRelate) Update(cols []string) (err error) {
+func (m *EtaBusinessConfigRelate) Update(cols []string) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Update(m, cols...)
 	return
 }
 
 
-func (m *EtaBusinessMenuApiRelate) GetItemById(id int) (item *EtaBusinessMenuApiRelate, err error) {
+func (m *EtaBusinessConfigRelate) GetItemById(id int) (item *EtaBusinessConfigRelate, err error) {
 	o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
 	err = o.Raw(sql, id).QueryRow(&item)
 	return
 }
 
-func (m *EtaBusinessMenuApiRelate) GetItemByCondition(condition string, pars []interface{}) (item *EtaBusinessMenuApiRelate, err error) {
+func (m *EtaBusinessConfigRelate) GetItemByCondition(condition string, pars []interface{}) (item *EtaBusinessConfigRelate, err error) {
 	o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
 	err = o.Raw(sql, pars).QueryRow(&item)
 	return
 }
 
-func (m *EtaBusinessMenuApiRelate) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
+func (m *EtaBusinessConfigRelate) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrm()
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	err = o.Raw(sql, pars).QueryRow(&count)
 	return
 }
 
-func (m *EtaBusinessMenuApiRelate) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*EtaBusinessMenuApiRelate, err error) {
+func (m *EtaBusinessConfigRelate) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*EtaBusinessConfigRelate, err error) {
 	o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
@@ -95,7 +95,7 @@ func (m *EtaBusinessMenuApiRelate) GetItemsByCondition(condition string, pars []
 	return
 }
 
-func (m *EtaBusinessMenuApiRelate) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*EtaBusinessMenuApiRelate, err error) {
+func (m *EtaBusinessConfigRelate) GetPageItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, startSize, pageSize int) (items []*EtaBusinessConfigRelate, err error) {
 	o := orm.NewOrm()
 	fields := strings.Join(fieldArr, ",")
 	if len(fieldArr) == 0 {
@@ -110,8 +110,8 @@ func (m *EtaBusinessMenuApiRelate) GetPageItemsByCondition(condition string, par
 	return
 }
 
-// EtaBusinessMenuApiRelateSaveReq 保存商家菜单关联
-type EtaBusinessMenuApiRelateSaveReq struct {
+// EtaBusinessConfigRelateSaveReq 保存商家菜单关联
+type EtaBusinessConfigRelateSaveReq struct {
 	EtaBusinessId int   `description:"商家ID"`
 	MenuIds       []int `description:"菜单IDs"`
 	HalfMenuIds   []int `description:"半选菜单IDs-仅供前端回显用的"`