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

aa

Browse Source
This commit is contained in:
suyl
2021-09-26 10:52:12 +08:00
parent 8159861654
commit f97eea31e0
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5141,7 +5141,7 @@ func GetStoreMapAudit(ctx *jxcontext.Context, storeIDs, vendorIDs, auditStatuss
return dao.GetStoreMapAudit(dao.GetDB(), storeIDs, vendorIDs, auditStatuss, utils.Str2Time(fromTime), utils.Str2Time(toTime), offset, pageSize) return dao.GetStoreMapAudit(dao.GetDB(), storeIDs, vendorIDs, auditStatuss, utils.Str2Time(fromTime), utils.Str2Time(toTime), offset, pageSize)
} }
func GetBrandUser(ctx *jxcontext.Context, brandID int) (brandUsers []*model.BrandUser, err error) { func GetBrandUser(ctx *jxcontext.Context, brandID int) (brandUsers []*dao.GetBrandUserResult, err error) {
return dao.GetBrandUser(dao.GetDB(), brandID, "") return dao.GetBrandUser(dao.GetDB(), brandID, "")
} }

16
business/model/dao/store.go
View File

@@ -1336,17 +1336,25 @@ func GetStoreMapAudit(db *DaoDB, storeIDs, vendorIDs, auditStatuss []int, fromTi
return page, err return page, err
} }
func GetBrandUser(db *DaoDB, brandID int, userID string) (brandUsers []*model.BrandUser, err error) { type GetBrandUserResult struct {
model.BrandUser
Name string `json:"name"`
}
func GetBrandUser(db *DaoDB, brandID int, userID string) (brandUsers []*GetBrandUserResult, err error) {
sql := ` sql := `
SELECT * FROM brand_user WHERE deleted_at = ? SELECT a.*, b.name
FROM brand_user a
LEFT JOIN user b ON a.user_id = b.user_id
WHERE a.deleted_at = ?
` `
sqlParams := []interface{}{utils.DefaultTimeValue} sqlParams := []interface{}{utils.DefaultTimeValue}
if brandID != 0 { if brandID != 0 {
sql += " AND brand_id = ?" sql += " AND a.brand_id = ?"
sqlParams = append(sqlParams, brandID) sqlParams = append(sqlParams, brandID)
} }
if userID != "" { if userID != "" {
sql += " AND user_id = ?" sql += " AND a.user_id = ?"
sqlParams = append(sqlParams, userID) sqlParams = append(sqlParams, userID)
} }
err = GetRows(db, &brandUsers, sql, sqlParams) err = GetRows(db, &brandUsers, sql, sqlParams)