From baef83d986b9b84b83c1e532728a564b580288a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 5 Jan 2021 16:43:04 +0800 Subject: [PATCH] aa --- business/jxstore/cms/store.go | 48 ++++++++++++++++++++++++++ business/model/dao/store.go | 17 ++++++++++ controllers/cms_store.go | 49 +++++++++++++++++++++++++++ routers/commentsRouter_controllers.go | 27 +++++++++++++++ 4 files changed, 141 insertions(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index bd1aaae28..e1fc1a083 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -3770,3 +3770,51 @@ func GetDiffJxStoreAndMTWMStoreInfo(ctx *jxcontext.Context, storeIDs []int) (err } return err } + +func GetBrands(ctx *jxcontext.Context, name string) (brands []*model.Brand, err error) { + return dao.GetBrands(dao.GetDB(), name) +} + +func AddBrand(ctx *jxcontext.Context, brand *model.Brand) (err error) { + var ( + db = dao.GetDB() + ) + if brand.Name == "" { + return fmt.Errorf("请输入品牌名！") + } + brand.Name = utils.TrimBlankChar(brand.Name) + dao.WrapAddIDCULDEntity(brand, ctx.GetUserName()) + err = dao.CreateEntity(db, brand) + return err +} + +func UpdateBrand(ctx *jxcontext.Context, payload map[string]interface{}, isDel bool) (err error) { + var ( + db = dao.GetDB() + brand = &model.Brand{} + ) + brand.ID = int(utils.MustInterface2Int64(payload["id"])) + dao.GetEntity(db, brand) + if isDel { + brand.DeletedAt = time.Now() + brand.LastOperator = ctx.GetUserName() + dao.UpdateEntity(db, brand, "DeletedAt", "LastOperator") + } else { + valid := dao.StrictMakeMapByStructObject(payload, brand, ctx.GetUserName()) + if len(valid) > 0 { + dao.Begin(db) + defer func() { + if r := recover(); r != nil { + dao.Rollback(db) + panic(r) + } + if _, err = dao.UpdateEntityLogically(db, brand, valid, ctx.GetUserName(), nil); err != nil { + dao.Rollback(db) + return + } + dao.Commit(db) + }() + } + } + return err +} diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 68918dc66..afe55204b 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -925,3 +925,20 @@ func GetStoreAuditPage(db *DaoDB, statuss []int, keyword string, applyTimeStart, } return pagedInfo, err } + +func GetBrands(db *DaoDB, name string) (brands []*model.Brand, err error) { + sql := ` + SELECT * + FROM brand + WHERE deleted_at = ? + ` + sqlParams := []interface{}{ + utils.DefaultTimeValue, + } + if name != "" { + sql += " AND name LIKE ?" + sqlParams = append(sqlParams, "%"+name+"%") + } + err = GetRows(db, &brands, sql, sqlParams) + return brands, err +} diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 2145f3b06..0b4578050 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -938,3 +938,52 @@ func (c *StoreController) GetJddjStoreInfo() { return retVal, "", err }) } + +// @Title 查询品牌 +// @Description 查询品牌 +// @Param token header string true "认证token" +// @Param name query string false "品牌名" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetBrands [get] +func (c *StoreController) GetBrands() { + c.callGetBrands(func(params *tStoreGetBrandsParams) (retVal interface{}, errCode string, err error) { + retVal, err = cms.GetBrands(params.Ctx, params.Name) + return retVal, "", err + }) +} + +// @Title 新增品牌 +// @Description 新增品牌 +// @Param token header string true "认证token" +// @Param payload formData string true "brand payload" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /AddBrand [post] +func (c *StoreController) AddBrand() { + c.callAddBrand(func(params *tStoreAddBrandParams) (retVal interface{}, errCode string, err error) { + var brand = &model.Brand{} + if err = utils.UnmarshalUseNumber([]byte(params.Payload), brand); err == nil { + err = cms.AddBrand(params.Ctx, brand) + } + return retVal, "", err + }) +} + +// @Title 修改品牌 +// @Description 修改品牌 +// @Param token header string true "认证token" +// @Param payload formData string true "brand payload" +// @Param isDel formData bool false "是否是删除" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /UpdateBrand [post] +func (c *StoreController) UpdateBrand() { + c.callUpdateBrand(func(params *tStoreUpdateBrandParams) (retVal interface{}, errCode string, err error) { + payload := make(map[string]interface{}) + if err = utils.UnmarshalUseNumber([]byte(params.Payload), &payload); err == nil { + err = cms.UpdateBrand(params.Ctx, payload, params.IsDel) + } + return retVal, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index e3dd94fe4..ded41205a 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -1854,6 +1854,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], + beego.ControllerComments{ + Method: "AddBrand", + Router: `/AddBrand`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], beego.ControllerComments{ Method: "AddStoreCategoryMap", @@ -1971,6 +1980,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], + beego.ControllerComments{ + Method: "GetBrands", + Router: `/GetBrands`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], beego.ControllerComments{ Method: "GetCorporationInfo", @@ -2214,6 +2232,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], + beego.ControllerComments{ + Method: "UpdateBrand", + Router: `/UpdateBrand`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"], beego.ControllerComments{ Method: "UpdateOrCreateCourierStores",