From 1d4872d34b79677f2ac515840c6de2f0f1a5af16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 29 Dec 2022 09:50:17 +0800 Subject: [PATCH 1/6] 1 --- business/jxstore/cms/sync_store_sku.go | 14 ++++++-------- business/partner/purchase/jdshop/store_sku.go | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 622b2dde7..4cd67dcf5 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -676,14 +676,12 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag // api.JdShop2API.SetCookieWithStr(configs[0].Value) // } } - if vendorID == model.VendorIDDD { - //createList, updateList []*dao.StoreSkuSyncInfo - //deleteList, stockList, onlineList, offlineList, priceList []*partner.StoreSkuInfo - //updateItems []*dao.KVUpdateItem - //reorderSkuMap map[string][]*dao.StoreSkuSyncInfo - globals.SugarLogger.Debugf("createList len = %d ", len(createList)) - } - + //createList, updateList []*dao.StoreSkuSyncInfo + //deleteList, stockList, onlineList, offlineList, priceList []*partner.StoreSkuInfo + //updateItems []*dao.KVUpdateItem + //reorderSkuMap map[string][]*dao.StoreSkuSyncInfo + globals.SugarLogger.Debugf("createList len = %d ", len(createList)) + globals.SugarLogger.Debugf("====skuList %s", utils.Format4Output(skus, false)) task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { step := batchItemList[0].(int) diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go index 2a756c3a0..e2a6178b8 100644 --- a/business/partner/purchase/jdshop/store_sku.go +++ b/business/partner/purchase/jdshop/store_sku.go @@ -33,6 +33,7 @@ var ( ) func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { + globals.SugarLogger.Debugf("======================================京东") if globals.EnableJdShopWrite { if vendorStoreID == model.JdShopMainVendorStoreID { for _, v := range storeSkuList { From fe77a22a2dc6fd0079ea3015e4b0251ed79c721e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 29 Dec 2022 10:04:23 +0800 Subject: [PATCH 2/6] 1 --- business/jxstore/cms/sync_store_sku.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 4cd67dcf5..f93a517fa 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -173,6 +173,7 @@ func SyncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag int, vendorID, storeID int, vendorStoreID, vendorOrgCode string, nameIDs, skuIDs, excludeSkuIDs []int, useVendorPriceDirectly, isAsync, isContinueWhenError bool) (hint string, err error) { + globals.SugarLogger.Debugf("==SyncStoreSkuNew2=====================%d,%s", storeID, utils.Format4Output(skuIDs, false)) singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) if singleStoreHandler != nil { // 本地创建商品分类 if err = CreateStoreCategoryByStoreSku(ctx, vendorID, storeID, vendorStoreID, nameIDs, skuIDs); err != nil { @@ -183,10 +184,12 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: + globals.SugarLogger.Debugf("==SyncStoreCategories=====================%d,%s", storeID, utils.Format4Output(skuIDs, false)) if singleStoreHandler != nil { _, err = SyncStoreCategories(ctx, task, vendorID, storeID, vendorStoreID, nameIDs, skuIDs, false, isContinueWhenError) } case 1: + globals.SugarLogger.Debugf("==syncStoreSkuNew=====================%d,%s", storeID, utils.Format4Output(skuIDs, false)) err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError) } return result, err @@ -438,6 +441,7 @@ func isSkuLockTimeValid(sku *dao.StoreSkuSyncInfo) bool { } func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag int, isFull bool, vendorID, storeID int, vendorOrgCode string, nameIDs, skuIDs, excludeSkuIDs []int, useVendorPriceDirectly, isContinueWhenError bool) (err error) { + globals.SugarLogger.Debugf("=======================%d,%s", storeID, utils.Format4Output(skuIDs, false)) db := dao.GetDB() storeDetail, err := dao.GetStoreDetail(db, storeID, vendorID, vendorOrgCode) if err != nil { From 359e8d2db56e2e546646d23754baf120a38ffc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 29 Dec 2022 10:11:44 +0800 Subject: [PATCH 3/6] 1 --- business/jxstore/cms/sync_store_sku.go | 4 +--- business/model/dao/store_sku.go | 2 ++ business/partner/delivery/tiktok_store/waybill.go | 4 ---- business/partner/purchase/jd/sku2.go | 2 -- business/partner/purchase/jdshop/store_sku.go | 1 - business/partner/purchase/tiktok_store/warehouse.go | 2 -- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index f93a517fa..ae85b9755 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -173,7 +173,6 @@ func SyncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag int, vendorID, storeID int, vendorStoreID, vendorOrgCode string, nameIDs, skuIDs, excludeSkuIDs []int, useVendorPriceDirectly, isAsync, isContinueWhenError bool) (hint string, err error) { - globals.SugarLogger.Debugf("==SyncStoreSkuNew2=====================%d,%s", storeID, utils.Format4Output(skuIDs, false)) singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) if singleStoreHandler != nil { // 本地创建商品分类 if err = CreateStoreCategoryByStoreSku(ctx, vendorID, storeID, vendorStoreID, nameIDs, skuIDs); err != nil { @@ -184,12 +183,10 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: - globals.SugarLogger.Debugf("==SyncStoreCategories=====================%d,%s", storeID, utils.Format4Output(skuIDs, false)) if singleStoreHandler != nil { _, err = SyncStoreCategories(ctx, task, vendorID, storeID, vendorStoreID, nameIDs, skuIDs, false, isContinueWhenError) } case 1: - globals.SugarLogger.Debugf("==syncStoreSkuNew=====================%d,%s", storeID, utils.Format4Output(skuIDs, false)) err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError) } return result, err @@ -454,6 +451,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else { skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs) } + globals.SugarLogger.Debugf("===skus====================%d,%s", storeID, utils.Format4Output(skus, false)) if err != nil || len(skus) == 0 { return err } diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 82dcc9dab..6aff7e4a0 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -687,6 +687,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo // } sql = fmt.Sprintf(sql, fmtParams...) sql += " ORDER BY t1.price" + globals.SugarLogger.Debugf("====slq := %s",sql) + globals.SugarLogger.Debugf("====param := %s",utils.Format4Output(panic,false)) if err = GetRows(db, &skus, sql, sqlParams...); err != nil { return nil, err } diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go index d05257287..b9272888f 100644 --- a/business/partner/delivery/tiktok_store/waybill.go +++ b/business/partner/delivery/tiktok_store/waybill.go @@ -42,18 +42,14 @@ func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.S } func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorStoreID string) (storeDetail *dao.StoreDetail2, err error) { - globals.SugarLogger.Debugf("storeID=======%d vendorStoreID==========%s", storeID, vendorStoreID) relInfo, err := dao.GetStoreDetailForDD(dao.GetDB(), storeID, model.VendorIDDD, vendorStoreID, "") if err != nil { return nil, errors.New("获取抖音平台账号信息失败，请重试") } - globals.SugarLogger.Debugf("relInfo=========%s", utils.Format4Output(relInfo, false)) apiObj := getAPI(relInfo.VendorOrgCode) - globals.SugarLogger.Debugf("relInfo.VendorOrgCode===========%s,apiObj=============%v", relInfo.VendorOrgCode, apiObj) if storeInfo, err := apiObj.GetStoreDetail(&shop_getStoreDetail_request.ShopGetStoreDetailParam{ StoreId: vendorStoreID, }); err == nil { - globals.SugarLogger.Debugf("DYPS GetStore storeInfo=====%s", utils.Format4Output(storeInfo, false)) storeDetail = &dao.StoreDetail2{ Store: model.Store{ Name: storeInfo.StoreDetail.Store.Name, diff --git a/business/partner/purchase/jd/sku2.go b/business/partner/purchase/jd/sku2.go index 74dc5436c..57b59cbcd 100644 --- a/business/partner/purchase/jd/sku2.go +++ b/business/partner/purchase/jd/sku2.go @@ -193,7 +193,6 @@ func skuInfo2Param(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (param *jd } func (p *PurchaseHandler) CreateSku2(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (err error) { - globals.SugarLogger.Debugf("是不是正儿八经的京东商城%s", "CreateSku2") param := skuInfo2Param(ctx, sku) if globals.EnableJdStoreWrite { sku.VendorSkuID, err = getAPI(sku.VendorOrgCode).AddSku2(param) @@ -228,7 +227,6 @@ func (p *PurchaseHandler) UpdateSku2(ctx *jxcontext.Context, sku *dao.StoreSkuSy } func (p *PurchaseHandler) DeleteSku2(ctx *jxcontext.Context, vendorOrgCode string, sku *partner.StoreSkuInfo) (err error) { - globals.SugarLogger.Debugf("是不是正儿八经的京东商城%s", "DeleteSku2") // 京东到家只能通过商家ID删除SKU，如果没有的话，先绑定，再删除 if sku.SkuID == 0 { skuPairList := []*jdapi.SkuIDPair{ diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go index e2a6178b8..2a756c3a0 100644 --- a/business/partner/purchase/jdshop/store_sku.go +++ b/business/partner/purchase/jdshop/store_sku.go @@ -33,7 +33,6 @@ var ( ) func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { - globals.SugarLogger.Debugf("======================================京东") if globals.EnableJdShopWrite { if vendorStoreID == model.JdShopMainVendorStoreID { for _, v := range storeSkuList { diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 97f8ab99a..6fd354be3 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -292,12 +292,10 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc } //3.设置门店起送价 默认为0 if bindSaleLimitID, err := GetStoreSaleLimit(vendorOrgCode, vendorStoreID); err != nil { - globals.SugarLogger.Debugf("进入获取门店起送价限售模板") errList.AddErr(fmt.Errorf("获取门店限售模板失败:%v", err)) } else { if bindSaleLimitID == 0 || utils.IsNil(bindSaleLimitID) { //创建 if createSaleLimitID, err := CreateAndBindMinPriceTemplate(vendorOrgCode, vendorStoreID, minPrice); err != nil { - globals.SugarLogger.Debugf("进入创建门店起送价限售模板,minPrice=======%d", minPrice) errList.AddErr(fmt.Errorf("设置门店起送价限售模板失败:%v", err)) } else { FreightTemplate.TradeLimitID = createSaleLimitID From f337c6d36bf3f8531e5a5d1ebd9fc26c86160ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 29 Dec 2022 10:16:24 +0800 Subject: [PATCH 4/6] 1 --- business/model/dao/store_sku.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 6aff7e4a0..b59f6d7a2 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -687,8 +687,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo // } sql = fmt.Sprintf(sql, fmtParams...) sql += " ORDER BY t1.price" - globals.SugarLogger.Debugf("====slq := %s",sql) - globals.SugarLogger.Debugf("====param := %s",utils.Format4Output(panic,false)) + globals.SugarLogger.Debugf("====slq := %s", sql) + globals.SugarLogger.Debugf("====param := %s", utils.Format4Output(sqlParams, false)) if err = GetRows(db, &skus, sql, sqlParams...); err != nil { return nil, err } From c40195a45f0afe9a68e0498931f337a76d24d280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 29 Dec 2022 10:54:32 +0800 Subject: [PATCH 5/6] 1 --- business/jxstore/cms/sync_store_sku.go | 2 ++ business/model/dao/store_sku.go | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index ae85b9755..ae56a5961 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -513,6 +513,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } } else if model.IsSyncStatusNew(sku.SkuSyncStatus) { calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)) + globals.SugarLogger.Debugf("calVendorPrice4StoreSku======= %s", utils.Format4Output(singleStoreHandler, false)) + globals.SugarLogger.Debugf("calVendorPrice4StoreSku======= %d", sku.MergedStatus) if singleStoreHandler == nil { if dao.IsVendorThingIDEmpty(sku.VendorSkuID) { // todo 多平台商品库没有正常创建，直接跳过 diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index b59f6d7a2..e5743a924 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -702,7 +702,6 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store // 以sku为基础来做全同步， // 多门店模式厂商适用 func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) { - // 对于多门店平台，商品库删除后，不需要操作门店商品，所以sku_name用JOIN, sku与sku_name也可以直接排除下架的 sql := ` SELECT From 37cca118e6f7d5456eea4eaa5804714e284012e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 29 Dec 2022 11:22:35 +0800 Subject: [PATCH 6/6] 1 --- business/jxstore/cms/sync_store_sku.go | 4 ---- business/model/dao/store_sku.go | 2 -- 2 files changed, 6 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index ae56a5961..4cd67dcf5 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -438,7 +438,6 @@ func isSkuLockTimeValid(sku *dao.StoreSkuSyncInfo) bool { } func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag int, isFull bool, vendorID, storeID int, vendorOrgCode string, nameIDs, skuIDs, excludeSkuIDs []int, useVendorPriceDirectly, isContinueWhenError bool) (err error) { - globals.SugarLogger.Debugf("=======================%d,%s", storeID, utils.Format4Output(skuIDs, false)) db := dao.GetDB() storeDetail, err := dao.GetStoreDetail(db, storeID, vendorID, vendorOrgCode) if err != nil { @@ -451,7 +450,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else { skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs) } - globals.SugarLogger.Debugf("===skus====================%d,%s", storeID, utils.Format4Output(skus, false)) if err != nil || len(skus) == 0 { return err } @@ -513,8 +511,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } } else if model.IsSyncStatusNew(sku.SkuSyncStatus) { calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)) - globals.SugarLogger.Debugf("calVendorPrice4StoreSku======= %s", utils.Format4Output(singleStoreHandler, false)) - globals.SugarLogger.Debugf("calVendorPrice4StoreSku======= %d", sku.MergedStatus) if singleStoreHandler == nil { if dao.IsVendorThingIDEmpty(sku.VendorSkuID) { // todo 多平台商品库没有正常创建，直接跳过 diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index e5743a924..3b5def8f9 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -687,8 +687,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo // } sql = fmt.Sprintf(sql, fmtParams...) sql += " ORDER BY t1.price" - globals.SugarLogger.Debugf("====slq := %s", sql) - globals.SugarLogger.Debugf("====param := %s", utils.Format4Output(sqlParams, false)) if err = GetRows(db, &skus, sql, sqlParams...); err != nil { return nil, err }