From f5db2daee2612e6222fae38857e6ccb71bc83034 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, 20 Dec 2019 08:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 8 ++++---- business/jxstore/cms/store_sku.go | 12 ------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 2bcea66ae..cbd40eae3 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -871,10 +871,10 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf return 0, err } - // if err = OnUpdateThing(ctx, db, nil, int64(v.ID), model.ThingTypeSku); err != nil { - // dao.Rollback(db) - // return 0, err - // } + if err = OnUpdateThing(ctx, db, nil, int64(v.ID), model.ThingTypeSku); err != nil { + dao.Rollback(db) + return 0, err + } } } skuIDs, err2 := dao.GetSkuIDByNames(db, []int{nameID}) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 9242a7dd2..0db981776 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -2536,24 +2536,12 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int, if partner.IsMultiStore(vendorID) { multiHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler) storeDetail, err = multiHandler.ReadStore(ctx, "", vendorStoreID) - if err != nil { - return retVal, err - } } else { singleHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreHandler) storeDetail, err = singleHandler.ReadStore(ctx, "", vendorStoreID) - if err != nil { - return retVal, err - } } outStoreSkuList, err := handler.GetStoreSkusBareInfo(ctx, v, task, 0, vendorStoreID, inStoreSkuList) - if err != nil { - return retVal, err - } skuNameList, err := dao.GetSkus(dao.GetDB(), []int{skuID}, nil, nil, nil) - if err != nil { - return retVal, err - } if storeDetail != nil { if len(skuNameList) > 0 { if len(outStoreSkuList) > 0 {