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

Merge remote-tracking branch 'origin/mark' into don

Browse Source
This commit is contained in:
Rosy-zhudan
2019-09-12 15:44:48 +08:00
parent 6b3b0bcd35 e789e17714
commit 7d194b3b90
4 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/place.go
View File

@@ -31,9 +31,9 @@ func GetPlacesByCond(db *DaoDB, enableCond int) (placeList []*model.Place, err e
FROM place
WHERE level = 2
`
if enableCond == 1 {
if enableCond == EnableCondEnalbed {
sql += " AND enabled = 1"
} else if enableCond == 2 {
} else if enableCond == EnableCondDisabled {
sql += " AND enabled = 0"
}
sql += " ORDER BY code"

6
business/model/store.go
View File

@@ -285,9 +285,9 @@ type Store struct {
Licence2Valid string `orm:"size(32)" json:"licence2Valid"` // 有效期开始
Licence2Expire string `orm:"size(32)" json:"licence2Expire"` // 有效期结束
MarketManName string `orm:"size(8)" json:"marketManName"` // 市场负责人姓名
// MarketManName string `orm:"size(8)" json:"marketManName"` // 市场负责人姓名
MarketManPhone string `orm:"size(16)" json:"marketManPhone"` // 市场负责人电话
MarketManRole string `orm:"size(32)" json:"marketManRole"` // 市场负责人组（角色）
MarketManRole string `orm:"size(32)" json:"marketManRole"` // 市场负责人组（角色，单人）
JxBrandFeeFactor int `json:"jxBrandFeeFactor"` // 京西品牌费因子
MarketAddFeeFactor int `json:"marketAddFeeFactor"` // 市场附加费因子
@@ -298,7 +298,7 @@ type Store struct {
PayeeBankCode string `orm:"size(8)" json:"payeeBankCode"` // 开户行代码
PayPercentage int `json:"payPercentage"`
OperatorName string `orm:"size(8)" json:"operatorName"` // 运营人姓名
// OperatorName string `orm:"size(8)" json:"operatorName"` // 运营人姓名
OperatorPhone string `orm:"size(16)" json:"operatorPhone"` // 运营人电话
OperatorRole string `orm:"size(32)" json:"operatorRole"` // 京东运营人组（角色）
OperatorRole2 string `orm:"size(32)" json:"operatorRole2"` // 非京东运营人组（角色）