liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- store中再添加一些市场，账号相关的信息

Browse Source
This commit is contained in:
gazebo
2019-05-20 09:39:59 +08:00
parent b4a6cc69ab
commit d67a730c50
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/cms/store.go
View File

@@ -115,6 +115,14 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
t1.licence2_code, t1.licence2_code,
t1.licence2_valid, t1.licence2_valid,
t1.licence2_expire, t1.licence2_expire,
t1.market_man_name,
t1.market_man_phone,
t1.jx_brand_fee,
t1.market_add_fee,
t1.payee_name,
t1.payee_account_no,
t1.payee_bank_branch_name,
t1.payee_bank_name,
city.name city_name, city.name city_name,
district.name district_name, district.name district_name,
@@ -252,7 +260,7 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
} }
sql += sqlWhere + ` sql += sqlWhere + `
GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 32,33,34,35,36,37,38,39,40,41,42,43,44,45 GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53
ORDER BY t1.id DESC ORDER BY t1.id DESC
LIMIT ? OFFSET ?` LIMIT ? OFFSET ?`
pageSize = jxutils.FormalizePageSize(pageSize) pageSize = jxutils.FormalizePageSize(pageSize)

16
business/model/store.go
View File

@@ -160,15 +160,15 @@ type Store struct {
Licence2Valid string `orm:"size(32)" json:"licence2Valid"` // 有效期开始 Licence2Valid string `orm:"size(32)" json:"licence2Valid"` // 有效期开始
Licence2Expire string `orm:"size(32)" json:"licence2Expire"` // 有效期结束 Licence2Expire string `orm:"size(32)" json:"licence2Expire"` // 有效期结束
// MarketManName string // 市场负责人姓名 MarketManName string // 市场负责人姓名
// MarketManPhone string // 市场负责人电话 MarketManPhone string // 市场负责人电话
// JxBrandFee int64 // 京西品牌费 JxBrandFee int64 // 京西品牌费
// MarketAddFee int64 // 市场附加费 MarketAddFee int64 // 市场附加费
// PayeeName string // 收款人姓名 PayeeName string // 收款人姓名
// PayeeAccountNo string // 收款账号 PayeeAccountNo string // 收款账号
// PayeeBankBranchName string // 开户银行 PayeeBankBranchName string // 开户银行
// PayeeBankName string // 开户支行 PayeeBankName string // 开户支行
} }
func (*Store) TableUnique() [][]string { func (*Store) TableUnique() [][]string {