From f4796bb9cd06482a55d867519310133d67dfbc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 16 Sep 2020 13:45:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=94=B3=E8=AF=B7=E5=85=A5?= =?UTF-8?q?=E9=A9=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 13 +++++++++++++ business/model/dao/store.go | 28 +++++++++++++++++++++++++++ controllers/cms_store.go | 2 +- routers/commentsRouter_controllers.go | 9 +++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 3cb920930..7d0602a50 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -3559,3 +3559,16 @@ func UpdateStorePushClient(ctx *jxcontext.Context, storeID int, cID string) (err } return err } + +func CreateStoreAudit(ctx *jxcontext.Context, storeAudit *model.StoreAudit) (err error) { + var ( + db = dao.GetDB() + ) + storeAudits, err := dao.GetStoreAudit(db, model.StoreAuditStatusOnline, storeAudit.UserID, "") + if len(storeAudits) > 0 { + return fmt.Errorf("您已申请过入驻,请不要重复申请!") + } + dao.WrapAddIDCULDEntity(storeAudit, ctx.GetUserName()) + dao.CreateEntity(db, storeAudit) + return err +} diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 0c6662663..654b3d0c2 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -837,3 +837,31 @@ func GetStorePushClient(db *DaoDB, storeID int, cID string) (storePushClient []* } return storePushClient, err } + +func GetStoreAudit(db *DaoDB, auditStatus int, userID, keyword string) (storeAudit []*model.StoreAudit, err error) { + sql := ` + SELECT * + FROM store_audit + WHERE deleted_at = ? + ` + sqlParams := []interface{}{ + utils.DefaultTimeValue, + } + if auditStatus != model.StoreStatusAll { + sql += " AND audit_status = ?" + sqlParams = append(sqlParams, auditStatus) + } + if userID != "" { + sql += " AND user_id = ?" + sqlParams = append(sqlParams, userID) + } + if keyword != "" { + sql += " AND (user_id LIKE ? OR name LIKE ? OR tel1 LIKE ? OR tel2 LIKE ? OR address LIKE ?)" + sqlParams = append(sqlParams, "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%") + } + err = GetRows(db, &storeAudit, sql, sqlParams) + if err != nil { + return nil, err + } + return storeAudit, err +} diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 4e9286e1f..866df9dff 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -852,7 +852,7 @@ func (c *StoreController) CreateStoreAudit() { c.callCreateStoreAudit(func(params *tStoreCreateStoreAuditParams) (retVal interface{}, errCode string, err error) { store := &model.StoreAudit{} if err = utils.UnmarshalUseNumber([]byte(params.Payload), store); err == nil { - // retVal, err = cms.CreateStore(params.Ctx, store, params.Ctx.GetUserName()) + err = cms.CreateStoreAudit(params.Ctx, store) } return retVal, "", err }) diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 52cdbcc15..84d5733e3 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -1773,6 +1773,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: "CreateStoreAudit", + Router: `/CreateStoreAudit`, + 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: "CreateStorePriceScore",