From 160ac2dd832092a745958a29fbb27a287960e62e Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 4 Dec 2018 20:23:22 +0800 Subject: [PATCH] - remove some comment --- business/jxstore/cms/sku.go | 4 ++++ business/jxstore/promotion/jd_promotion.go | 2 +- business/partner/purchase/mtwm/store_sku.go | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index f01878ff2..331f5e75b 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -69,6 +69,7 @@ func AddCategory(ctx *jxcontext.Context, cat *model.SkuCategory, userName string dao.WrapAddIDCULDEntity(cat, userName) cat.JdSyncStatus = model.SyncFlagNewMask cat.JdID = jxutils.GenFakeID() + cat.Name = strings.Trim(cat.Name, " ") if cat.Seq <= 0 { var maxSeq struct { MaxSeq int @@ -90,6 +91,9 @@ func UpdateCategory(ctx *jxcontext.Context, categoryID int, payload map[string]i cat.ID = categoryID valid := dao.NormalMakeMapByStructObject(payload, cat, userName) if len(valid) > 0 { + if valid["name"] != nil { + valid["name"] = strings.Trim(valid["name"].(string), " ") + } db := dao.GetDB() if num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, cat, valid, userName, nil, model.FieldJdSyncStatus); err == nil { _, err = CurVendorSync.SyncCategory(ctx, db, categoryID, false, userName) diff --git a/business/jxstore/promotion/jd_promotion.go b/business/jxstore/promotion/jd_promotion.go index fc5109eb8..1fb6d8400 100644 --- a/business/jxstore/promotion/jd_promotion.go +++ b/business/jxstore/promotion/jd_promotion.go @@ -766,7 +766,7 @@ func RefreshJdStoreSkuStock(promotionID int, skuIDs []int) (err error) { StockQty: model.MaxStoreSkuStockQty, }) } - globals.SugarLogger.Debugf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys stationNo:%s, stockList:%s", stationNo, utils.Format4Output(stockList, false)) + // globals.SugarLogger.Debugf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys stationNo:%s, stockList:%s", stationNo, utils.Format4Output(stockList, false)) _, err = api.JdAPI.BatchUpdateCurrentQtys("", stationNo, stockList, userName) if err != nil { globals.SugarLogger.Warnf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys failed with error:%v", err) diff --git a/business/partner/purchase/mtwm/store_sku.go b/business/partner/purchase/mtwm/store_sku.go index 3dce967e3..d8718d74d 100644 --- a/business/partner/purchase/mtwm/store_sku.go +++ b/business/partner/purchase/mtwm/store_sku.go @@ -307,7 +307,7 @@ func (p *PurchaseHandler) FullSyncStoreSkus(ctx *jxcontext.Context, parentTask t case 3: _, err = p.SyncStoreCategory(ctx, rootTask, storeID, false) case 4: - // _, err = p.SyncStoreSkus(ctx, rootTask, storeID, nil, true, isContinueWhenError) + _, err = p.SyncStoreSkus(ctx, rootTask, storeID, nil, true, isContinueWhenError) } return nil, err }, 5)