From bbd4d649c3fcd463846c7585bc174eb6f888b63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 6 Mar 2020 18:31:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku.go | 33 +++++++++++++++++++++++++-- routers/commentsRouter_controllers.go | 9 ++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 3289462ed..c37b04071 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -3885,7 +3885,36 @@ func BackUpStoreSkuBind(ctx *jxcontext.Context, isAsync, isContinueWhenError boo return hint, err } -func ReturnStoreSkuBind(ctx *jxcontext.Context, snapshotAt string, storeIDs, skuIDs []int)(err error) { - +func ReturnStoreSkuBind(ctx *jxcontext.Context, snapshotAt string, storeIDs, skuIDs []int) (err error) { + var ( + spAt = utils.Time2Date(utils.Str2Time(snapshotAt)) + db = dao.GetDB() + ) + if len(storeIDs) == 0 { + return fmt.Errorf("必须选择一个门店!") + } + if len(storeIDs) > 1 { + return fmt.Errorf("暂时只支持一次操作一个门店!") + } + //删除原门店商品 + sql := `DELETE FROM store_sku_bind WHERE store_id IN(` + dao.GenQuestionMarks(len(storeIDs)) + `)` + sqlParams := []interface{}{storeIDs} + _, err = dao.ExecuteSQL(db, sql, sqlParams) + + //查询备份的门店商品 + var storeHiss []*model.StoreSkuBindHistory + sql2 := `SELECT * FROM store_sku_bind WHERE snapshot_at = ? AND store_id IN(` + dao.GenQuestionMarks(len(storeIDs)) + `)` + sqlParams2 := []interface{}{spAt, storeIDs} + err = dao.GetRows(db, storeHiss, sql2, sqlParams2) + + //插入到现在 + var storeSkus []*model.StoreSkuBind + for _, v := range storeHiss { + storeSku := &model.StoreSkuBind{} + storeSku = &v.StoreSkuBind + storeSku.ID = v.StoreSkuBindID + storeSkus = append(storeSkus, storeSku) + } + dao.CreateMultiEntities(db, storeSkus) return err } diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index a9b381ca7..6e3ae6663 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -1962,6 +1962,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"], + beego.ControllerComments{ + Method: "ReturnStoreSkuBind", + Router: `/ReturnStoreSkuBind`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"], beego.ControllerComments{ Method: "SendSeckillSkusCountMsg",