From 659e87e73abf2f09000c0227b42c482af064239f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 30 Dec 2022 15:00:25 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store.go | 1 - business/jxstore/cms/sync.go | 1 - business/model/dao/thing_map.go | 11 +++++++++++ controllers/cms_sku.go | 8 ++++---- controllers/tiktok_delivery.go | 1 - controllers/tiktok_order.go | 1 - 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index c2001727b..df49da4ce 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -784,7 +784,6 @@ func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorS return nil, err } if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil { - globals.SugarLogger.Debugf("step1 handler==============%s", handler) result, err2 := handler.ReadStore(ctx, vendorOrgCode, vendorStoreID, "") if err = err2; err == nil { retVal = &StoreExt{ diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 1c1948e6e..7c2a82b48 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -288,7 +288,6 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs var vendorStoreID string storeMap := loopMapInfo.StoreMapList[0] if model.IsSyncStatusNew(storeMap.SyncStatus) { - globals.SugarLogger.Debug("进入handler.CreateStore2") storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, storeMap.VendorID, storeMap.VendorOrgCode) if vendorStoreID, err = handler.CreateStore2(db2, storeMap.StoreID, userName, nil, storeDetail); err == nil { resultList = append(resultList, 1) diff --git a/business/model/dao/thing_map.go b/business/model/dao/thing_map.go index 921e0789b..907014b85 100644 --- a/business/model/dao/thing_map.go +++ b/business/model/dao/thing_map.go @@ -1,6 +1,7 @@ package dao import ( + "fmt" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" ) @@ -50,8 +51,15 @@ func UpdateThingMap(thingMap *model.ThingMap) error { return err } +var thingMapList = make(map[string][]*model.ThingMap, 1024) + // GetThingToTiktokMapList 抖店获取同步类型 func GetThingToTiktokMapList(db *DaoDB, vendorId int, thingId int64, vendorOrgCode string) (cats []*model.ThingMap, err error) { + if _, ok := thingMapList[fmt.Sprintf("%d_%s_%d", vendorId, vendorOrgCode, thingId)]; ok { + if len(thingMapList[fmt.Sprintf("%d_%s_%d", vendorId, vendorOrgCode, thingId)]) != 0 { + return thingMapList[fmt.Sprintf("%d_%s_%d", vendorId, vendorOrgCode, thingId)], nil + } + } sql := ` SELECT t1.* FROM thing_map t1 @@ -65,6 +73,9 @@ func GetThingToTiktokMapList(db *DaoDB, vendorId int, thingId int64, vendorOrgCo } err = GetRows(db, &cats, sql, sqlParams...) + if len(cats) != 0 { + thingMapList[fmt.Sprintf("%d_%s_%d", cats[0].VendorID, cats[0].VendorOrgCode, cats[0].ThingID)] = cats + } return cats, err } diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index 30d6359ea..79d0cbd8d 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -886,21 +886,21 @@ func (c *SkuController) UpdateTiktokCategory() { item.VendorCategoryID = data2[v.DdId] skuVendorCategoryMap := &model.SkuVendorCategoryMap{} if err := dao.GetRow(db, skuVendorCategoryMap, `SELECT * FROM sku_vendor_category_map WHERE name_id = ? AND vendor_id = ? AND deleted_at = ?`, []interface{}{v.NameId, model.VendorIDDD, utils.DefaultTimeValue}); err != nil { - globals.SugarLogger.Debugf("====================err3 %s", err) + globals.SugarLogger.Errorf("get row err : %v", err) } if skuVendorCategoryMap != nil && skuVendorCategoryMap.ID > 0 { if _, err := dao.UpdateEntity(db, skuVendorCategoryMap, "VendorCategoryID"); err != nil { - globals.SugarLogger.Debugf("====================err4 %s", err) + globals.SugarLogger.Errorf("update err : %v", err) } } else { if err := dao.CreateEntity(db, item); err != nil { - globals.SugarLogger.Debugf("====================err5 %s", err) + globals.SugarLogger.Errorf("create err : %v", err) } } go func() { time.Sleep(500 * time.Millisecond) hit, err := cms.CurVendorSync.SyncStoresSkus(params.Ctx, nil, 0, db, []int{14}, []int{v.StoreId}, []int{v.Id}, true, false, true) - globals.SugarLogger.Debugf("===============hit:%s err: %s", hit, err) + globals.SugarLogger.Debugf("hit:%s err: %v", hit, err) }() } if page*pageSize < total { diff --git a/controllers/tiktok_delivery.go b/controllers/tiktok_delivery.go index fcae5e8ed..0bd9daf92 100644 --- a/controllers/tiktok_delivery.go +++ b/controllers/tiktok_delivery.go @@ -157,7 +157,6 @@ func (c *LogisticsController) LogisticsQuery() { // 查询订单的运单是否存在 data, err := dao.GetWayBillsByWayBillId(dao.GetDB(), param.TrackNo) if err != nil || len(data) == 0 { - globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s,运单号 :%s", err.Error(), param.TrackNo) c.Data["json"] = LogisticsQueryRest{ Result: false, ReturnCode: "1002", diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 86d5f3589..9c5e2e345 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -40,7 +40,6 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { for k, v := range orderStatus { for _, callback := range v { - globals.SugarLogger.Debugf("CallbackTiktokOrderMsg v======%s", utils.Format4Output(v, false)) resp2 := tiktok_store.OnOrderMsg(k, callback) if resp2.Code != 0 { t.Data["json"] = resp2