diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 88a806f25..c5742d8aa 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1064,7 +1064,7 @@ func SortCategorySkus(ctx *jxcontext.Context, catID int, skuIDList []int) (err e dao.Begin(db) defer func() { - if r := recover(); r != nil || err != nil { + if r := recover(); r != nil { dao.Rollback(db) if r != nil { panic(r) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 079d2f36a..83c4b58d7 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -526,3 +526,10 @@ func GetExistingStoreSkuNameInfo(db *DaoDB, storeIDs, skuNameIDs []int) (storeSk err = GetRows(db, &storeSkuNameList, sql, sqlParams...) return storeSkuNameList, err } + +func (s *StoreSkuSyncInfo) GetSeq() int { + if s.Seq > 0 { + return s.Seq + } + return int(s.VendorPrice) + } \ No newline at end of file diff --git a/business/model/model.go b/business/model/model.go index 9c2a8c567..dde6a51b9 100644 --- a/business/model/model.go +++ b/business/model/model.go @@ -49,7 +49,7 @@ const ( FieldActID = "ActID" FieldVendorActID = "VendorActID" - FieldSkuSeq = "seq" + FieldSkuSeq = "Seq" ) type ModelIDCUL struct { diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 7b2e7261f..7c1046bd5 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.Seq) + return int(ebaiapi.MaxSkuCatRank - storeSku.GetSeq()) } // 饿百的排序是从大到小 diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index ff7907989..52ce4e300 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.Seq + foodData["sequence"] = storeSku.GetSeq() if storeSku.VendorVendorCatID != 0 { foodData["tag_id"] = utils.Int64ToStr(storeSku.VendorVendorCatID) } else {