From a7270ccd844e0254e2aca59fdedabb7fa9afaf3a Mon Sep 17 00:00:00 2001 From: Rosy-zhudan Date: Fri, 30 Aug 2019 15:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=84=E5=A4=84=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2=E5=8A=A0=E5=85=A5Seq=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 71 +++++++++----------- business/jxstore/cms/store_sku.go | 4 +- business/partner/purchase/ebai/store_sku2.go | 2 +- business/partner/purchase/mtwm/store_sku2.go | 2 +- controllers/cms_sku.go | 10 +-- routers/commentsRouter_controllers.go | 4 +- 6 files changed, 44 insertions(+), 49 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 8171cfe08..88a806f25 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1044,7 +1044,7 @@ func UploadImg2Platforms(ctx *jxcontext.Context, parentTask tasksch.ITask, imgUR return imgHintMap, err } -func SortCategorySku(ctx *jxcontext.Context, catID int, skuIDList []int) (err error) { +func SortCategorySkus(ctx *jxcontext.Context, catID int, skuIDList []int) (err error) { db := dao.GetDB() userName := ctx.GetUserName() var skuList []*model.Sku @@ -1062,53 +1062,48 @@ func SortCategorySku(ctx *jxcontext.Context, catID int, skuIDList []int) (err er } } - // dao.Begin(db) - // defer func() { - // if r := recover(); r != nil || err != nil { - // dao.Rollback(db) - // if r != nil { - // panic(r) - // } - // } - // }() + dao.Begin(db) + defer func() { + if r := recover(); r != nil || err != nil { + dao.Rollback(db) + if r != nil { + panic(r) + } + } + }() nameIDList := []int{} for _, value := range skuList { seq := skuIDMap[value.ID] kvs := map[string]interface{} { model.FieldSkuSeq: seq, + //model.FieldJdSyncStatus: (value.JdSyncStatus | model.SyncFlagModifiedMask), } - dao.UpdateEntityLogically(db, value, kvs, userName, nil) - - sku := &model.Sku{} - sku.ID = value.ID - dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, sku, nil, ctx.GetUserName(), nil, model.FieldJdSyncStatus, model.SyncFlagModifiedMask) - - nameID := value.NameID - nameIDList = append(nameIDList, nameID) - _, err = CurVendorSync.SyncSku(ctx, db, nameID, -1, false, false, userName) + dao.UpdateEntityLogically(db, value, kvs, userName, nil) + nameIDList = append(nameIDList, value.NameID) } + //_, err = CurVendorSync.SyncSkus(ctx, db, nameIDList, []int{}, false, false, userName) - // skuIDs, err2 := dao.GetSkuIDByNames(db, nameIDList) - // if err = err2; err == nil && len(skuIDs) > 0 { - // _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), skuIDs, model.SyncFlagModifiedMask) - // } - // if err == nil { - // dao.Commit(db) - // } else { - // dao.Rollback(db) - // } - taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { - switch step { - case 0: - skuIDs, err2 := dao.GetSkuIDByNames(db, nameIDList) - if err = err2; err == nil && len(skuIDs) > 0 { - _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), skuIDs, model.SyncFlagModifiedMask) - } + if err == nil { + dao.Commit(db) + skuIDs, err2 := dao.GetSkuIDByNames(db, nameIDList) + if err = err2; err == nil && len(skuIDs) > 0 { + _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), skuIDs, model.SyncFlagModifiedMask) } - return result, err + // taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { + // switch step { + // case 0: + // skuIDs, err2 := dao.GetSkuIDByNames(db, nameIDList) + // if err = err2; err == nil && len(skuIDs) > 0 { + // _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), skuIDs, model.SyncFlagModifiedMask) + // } + // } + // return result, err + // } + // taskSeq := tasksch.NewSeqTask("SortCategorySku", ctx, taskSeqFunc, 1) + // taskSeq.Run() + } else { + dao.Rollback(db) } - taskSeq := tasksch.NewSeqTask("SortCategorySku", ctx, taskSeqFunc, 1) - taskSeq.Run() } return err diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 736766c2c..566d53280 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -373,12 +373,12 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo sqlParams = append(sqlParams, v.NameID, v.StoreID) } sql += `) - ORDER BY t3.id, t2.name_id, t2.id + ORDER BY t3.id, MIN(t2.seq), t2.name_id, t2.id ` } else { if isFocus { sql += ` - ORDER BY t3.id, t2.name_id, t2.id + ORDER BY t3.id, MIN(t2.seq), t2.name_id, t2.id ` } sql += ` diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 7056381e7..7b2e7261f 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -284,7 +284,7 @@ func getEbaiCat(catID int64, level int) int64 { // 饿百的排序是从大到小 func genSkuCatRank(storeSku *dao.StoreSkuSyncInfo) int { - return int(ebaiapi.MaxSkuCatRank - storeSku.VendorPrice) + return int(ebaiapi.MaxSkuCatRank - storeSku.Seq) } // 饿百的排序是从大到小 diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 687300205..ff7907989 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -171,7 +171,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI if storeSku.DescImg != "" { foodData["picture_contents"] = storeSku.DescImg } - foodData["sequence"] = storeSku.VendorPrice + foodData["sequence"] = storeSku.Seq if storeSku.VendorVendorCatID != 0 { foodData["tag_id"] = utils.Int64ToStr(storeSku.VendorVendorCatID) } else { diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index 039c6dfc5..af1750251 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -2,8 +2,8 @@ package controllers import ( "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxstore/cms" + "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "github.com/astaxie/beego" @@ -348,12 +348,12 @@ func (c *SkuController) GetSensitiveWordList() { // @Param skuIDs formData string true "商品子分类下商品列表" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /SortCategorySku [post] -func (c *SkuController) SortCategorySku() { - c.callSortCategorySku(func(params *tSkuSortCategorySkuParams) (retVal interface{}, errCode string, err error) { +// @router /SortCategorySkus [post] +func (c *SkuController) SortCategorySkus() { + c.callSortCategorySkus(func(params *tSkuSortCategorySkusParams) (retVal interface{}, errCode string, err error) { var skuIDList []int if err = jxutils.Strings2Objs(params.SkuIDs, &skuIDList); err == nil { - err = cms.SortCategorySku(params.Ctx, params.CatID, skuIDList) + err = cms.SortCategorySkus(params.Ctx, params.CatID, skuIDList) } return retVal, "", err diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 220d56c88..c1cf51191 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -1107,8 +1107,8 @@ func init() { beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"], beego.ControllerComments{ - Method: "SortCategorySku", - Router: `/SortCategorySku`, + Method: "SortCategorySkus", + Router: `/SortCategorySkus`, AllowHTTPMethods: []string{"post"}, MethodParams: param.Make(), Filters: nil,