From fd8e9b00cd89882c70b2616b25dea82f6b9f71a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 13:39:00 +0800 Subject: [PATCH 01/13] 1 --- business/jxstore/cms/store.go | 2 +- .../purchase/tiktok_store/store_sku2_utils.go | 32 +++++++++++++++---- controllers/tiktok_order.go | 19 ++++++++++- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 7021e6b28..c41932ca0 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4427,7 +4427,7 @@ func RefreshTiktokShopToken(ctx *jxcontext.Context) (err error) { globals.SugarLogger.Debugf("定时任务更新抖店店铺token错误:%s,%s", utils.Format4Output(v, false), err.Error()) continue } - if access.ExpiresIn-time.Now().Unix() > 24*60*60 { + if access.ExpiresIn-time.Now().Unix() > 48*60*60 { continue } api.SetToken(access.AccessToken) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index b0a9042c8..50e25c3d5 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -120,7 +120,8 @@ func GetSkuDetailList(api *tiktokShop.API, param *MainSku) (*product_listV2_resp // 抖店的商品只管创建,创建接口会返回成功,但是审核的时候不一定成功.当前系统无法判定此商品是否已经创建过了! func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo, isCreate bool) (failedList []*partner.StoreSkuInfoWithErr, err error) { var syncType string - storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeID, model.VendorIDDD, "") + db := dao.GetDB() + storeDetail, _ := dao.GetStoreDetail(db, storeID, model.VendorIDDD, "") api := getAPI(storeDetail.VendorOrgCode, storeID, vendorStoreID) if isCreate { syncType = "创建商品" @@ -204,7 +205,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 根据本地商品id获取线上商品是否存在,存在则只创建子商品 var tiktokResultProductId int64 = 0 // 获取本地存储映射关系 - localThing, err := dao.GetThingToTiktokMapList(dao.GetDB(), model.VendorIDDD, int64(storeSku.SkuID)) + localThing, err := dao.GetThingToTiktokMapList(db, model.VendorIDDD, int64(storeSku.SkuID)) if len(localThing) == 0 { // 线上不存在创建 tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品 if err != nil { @@ -228,7 +229,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 创建子商品 temp, err := dao.QueryStoreBindInfo(storeDetail.ID) - if err != nil || temp == nil || temp.TemplateID == 0 { + if err != nil || temp == nil || temp.ID == 0 { // 运费模板 param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) if err != nil { @@ -249,10 +250,28 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI TradeLimitID: param.SaleLimitId, } dao.WrapAddIDCULDEntity(freightTemplate, "jxAdmin") - err = dao.CreateEntity(dao.GetDB(), freightTemplate) + err = dao.CreateEntity(db, freightTemplate) } else { - param.FreightId = temp.TemplateID - param.SaleLimitId = temp.TradeLimitID + if temp.TemplateID != 0 { + param.FreightId = temp.TemplateID + } else { + // 运费模板 + param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) + if err != nil { + return nil, err + } + dao.UpdateEntity(db, temp, "TemplateID") + } + if temp.TradeLimitID != 0 { + param.SaleLimitId = temp.TradeLimitID + } else { + // 获取门店限售模板 + param.SaleLimitId, err = CreateSaleTemp(utils.Str2Int64(vendorStoreID), api) + if err != nil { + return nil, err + } + dao.UpdateEntity(db, temp, "TradeLimitID") + } } param.MainProductId = tiktokResultProductId @@ -479,7 +498,6 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao return 0, err } freightId = temp.TemplateId - dao.InsertIntoFreightTemplate(storeDetail.Store.ID, storeDetail.VendorStoreID, freightId, 0, 0, 0) } globals.SugarLogger.Debugf("freightId =last %d", freightId) return freightId, nil diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 2a1eecdcb..eb7b7dfac 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -2,7 +2,9 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" + "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" "strings" @@ -28,12 +30,27 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { } // 2.参数解析 - orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList) + orderStatus, storeMap, resp := api.TiktokStore.CreateOrderCallback(byteList) if resp.Code != 0 { t.Data["json"] = resp t.ServeJSON() return } + globals.SugarLogger.Debugf("storeMap %s", utils.Format4Output(storeMap, false)) + // 判断订单来源(门店所属菜市,果园,其他方) + //for k, _ := range storeMap { + // vendorStoreId := utils.Int64ToStr(k) + // storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDDD, "") + // if err != nil { + // globals.SugarLogger.Errorf("门店信息获取失败: %s", err) + // continue + // } + // if storeDetail != nil { + // continue + // } else { + // // 进入这里面就可能是果园或者其他三放的订单了,将当前信息推送过去 + // } + //} for k, v := range orderStatus { for _, callback := range v { From 172acbefab89fd19c99434c048a1a6c1e0291540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 14:44:36 +0800 Subject: [PATCH 02/13] 1 --- business/partner/purchase/tiktok_store/store_sku2_utils.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 50e25c3d5..880f1da3f 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -260,7 +260,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI if err != nil { return nil, err } - dao.UpdateEntity(db, temp, "TemplateID") + dao.UpdateEntity(db, &temp, "TemplateID") } if temp.TradeLimitID != 0 { param.SaleLimitId = temp.TradeLimitID @@ -270,7 +270,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI if err != nil { return nil, err } - dao.UpdateEntity(db, temp, "TradeLimitID") + dao.UpdateEntity(db, &temp, "TradeLimitID") } } From 78d9c1b90d9c4b43f380d1abbc65bbf0aef4fd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 14:52:06 +0800 Subject: [PATCH 03/13] 1 --- .../purchase/tiktok_store/store_sku2_utils.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 880f1da3f..b5f795ac6 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -230,6 +230,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 创建子商品 temp, err := dao.QueryStoreBindInfo(storeDetail.ID) if err != nil || temp == nil || temp.ID == 0 { + globals.SugarLogger.Debugf("============1") // 运费模板 param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) if err != nil { @@ -251,16 +252,20 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } dao.WrapAddIDCULDEntity(freightTemplate, "jxAdmin") err = dao.CreateEntity(db, freightTemplate) + globals.SugarLogger.Debugf("============err %s", err.Error()) } else { + globals.SugarLogger.Debugf("============2") if temp.TemplateID != 0 { param.FreightId = temp.TemplateID } else { // 运费模板 param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) if err != nil { + globals.SugarLogger.Debugf("===GetDeliveryTemp=========err %s", err.Error()) return nil, err } - dao.UpdateEntity(db, &temp, "TemplateID") + _, err = dao.UpdateEntity(db, &temp, "TemplateID") + globals.SugarLogger.Debugf("=====UpdateEntity=======err %s", err.Error()) } if temp.TradeLimitID != 0 { param.SaleLimitId = temp.TradeLimitID @@ -268,9 +273,11 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 获取门店限售模板 param.SaleLimitId, err = CreateSaleTemp(utils.Str2Int64(vendorStoreID), api) if err != nil { + globals.SugarLogger.Debugf("==CreateSaleTemp==========err %s", err.Error()) return nil, err } - dao.UpdateEntity(db, &temp, "TradeLimitID") + _, err = dao.UpdateEntity(db, &temp, "TradeLimitID") + globals.SugarLogger.Debugf("============UpdateEntity %s", err.Error()) } } @@ -280,6 +287,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.StoreId = utils.Str2Int64(vendorStoreID) // 抖店创建子商品 tiktokResultChildren, err := api.CreateStoreCommodity(param) + globals.SugarLogger.Debugf("============CreateStoreCommodity %s", err.Error()) if err != nil { failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) if storeSku.VendorSkuID == "" { From 6786439e6031506c097f6c007d728755d4f75244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:02:36 +0800 Subject: [PATCH 04/13] 1 --- .../partner/purchase/tiktok_store/store_sku2_utils.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index b5f795ac6..8712e00d3 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -228,9 +228,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } // 创建子商品 - temp, err := dao.QueryStoreBindInfo(storeDetail.ID) + temp, err := dao.QueryStoreBindInfo(storeDetail.Store.ID) if err != nil || temp == nil || temp.ID == 0 { - globals.SugarLogger.Debugf("============1") // 运费模板 param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) if err != nil { @@ -250,22 +249,17 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI FenceID: "", TradeLimitID: param.SaleLimitId, } - dao.WrapAddIDCULDEntity(freightTemplate, "jxAdmin") err = dao.CreateEntity(db, freightTemplate) - globals.SugarLogger.Debugf("============err %s", err.Error()) } else { - globals.SugarLogger.Debugf("============2") if temp.TemplateID != 0 { param.FreightId = temp.TemplateID } else { // 运费模板 param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) if err != nil { - globals.SugarLogger.Debugf("===GetDeliveryTemp=========err %s", err.Error()) return nil, err } _, err = dao.UpdateEntity(db, &temp, "TemplateID") - globals.SugarLogger.Debugf("=====UpdateEntity=======err %s", err.Error()) } if temp.TradeLimitID != 0 { param.SaleLimitId = temp.TradeLimitID @@ -273,11 +267,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 获取门店限售模板 param.SaleLimitId, err = CreateSaleTemp(utils.Str2Int64(vendorStoreID), api) if err != nil { - globals.SugarLogger.Debugf("==CreateSaleTemp==========err %s", err.Error()) return nil, err } _, err = dao.UpdateEntity(db, &temp, "TradeLimitID") - globals.SugarLogger.Debugf("============UpdateEntity %s", err.Error()) } } @@ -287,7 +279,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI param.StoreId = utils.Str2Int64(vendorStoreID) // 抖店创建子商品 tiktokResultChildren, err := api.CreateStoreCommodity(param) - globals.SugarLogger.Debugf("============CreateStoreCommodity %s", err.Error()) if err != nil { failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType) if storeSku.VendorSkuID == "" { From 4a5c2c6d0de55bb2f7f20684113fb4b0d85a3693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:05:40 +0800 Subject: [PATCH 05/13] 1 --- business/model/dao/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 760520eae..cc2b8c760 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1572,7 +1572,7 @@ func QueryStoreBindInfo(storeID int) (*model.FreightTemplate, error) { ) sql := "SELECT a.store_id,a.vendor_store_id,a.template_id,a.warehouse_id,a.fence_id,a.trade_limit_id FROM freight_template a " if storeID != 0 { - sql += "WHERE store_id = ? " + sql += "WHERE a.store_id = ? " sqlParams = append(sqlParams, storeID) } if err := GetRow(GetDB(), &bindInfo, sql, sqlParams); err != nil { From a90df52e69a63e7ce235d2ad3da00f3b049bd959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:09:37 +0800 Subject: [PATCH 06/13] 1 --- business/model/dao/store.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index cc2b8c760..363726ab0 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1566,16 +1566,17 @@ func GetStoreBrandInfos(storeID int) (date *BrandInfos, err error) { // 查询FreightTemplate func QueryStoreBindInfo(storeID int) (*model.FreightTemplate, error) { + if storeID == model.NO { + return nil, errors.New("storeId 不能为0") + } var ( sqlParams []interface{} bindInfo *model.FreightTemplate ) sql := "SELECT a.store_id,a.vendor_store_id,a.template_id,a.warehouse_id,a.fence_id,a.trade_limit_id FROM freight_template a " - if storeID != 0 { - sql += "WHERE a.store_id = ? " - sqlParams = append(sqlParams, storeID) - } - if err := GetRow(GetDB(), &bindInfo, sql, sqlParams); err != nil { + sql += "WHERE a.store_id = ? " + sqlParams = append(sqlParams, storeID) + if err := GetRow(GetDB(), &bindInfo, sql, sqlParams...); err != nil { return nil, err } return bindInfo, nil From b3c424c161299155231f50b9a12fe51e4e0f0223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:12:24 +0800 Subject: [PATCH 07/13] 1 --- business/partner/purchase/tiktok_store/store_sku2_utils.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 8712e00d3..e96bf40bb 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -229,6 +229,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 创建子商品 temp, err := dao.QueryStoreBindInfo(storeDetail.Store.ID) + globals.SugarLogger.Debugf("================temp:= %s", utils.Format4Output(temp, false)) + globals.SugarLogger.Debugf("================storeDetail:= %s", utils.Format4Output(storeDetail, false)) if err != nil || temp == nil || temp.ID == 0 { // 运费模板 param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) From 1fd144d1e1ac971aeea3a6a6b74ec7744ca173d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:15:29 +0800 Subject: [PATCH 08/13] 1 --- business/model/dao/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 363726ab0..08dc20850 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1573,7 +1573,7 @@ func QueryStoreBindInfo(storeID int) (*model.FreightTemplate, error) { sqlParams []interface{} bindInfo *model.FreightTemplate ) - sql := "SELECT a.store_id,a.vendor_store_id,a.template_id,a.warehouse_id,a.fence_id,a.trade_limit_id FROM freight_template a " + sql := "SELECT a.* FROM freight_template a " sql += "WHERE a.store_id = ? " sqlParams = append(sqlParams, storeID) if err := GetRow(GetDB(), &bindInfo, sql, sqlParams...); err != nil { From 24e5df627cf0d0f1f71f97aed3fe58c626ef8894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:24:44 +0800 Subject: [PATCH 09/13] 1 --- business/partner/purchase/tiktok_store/store_sku2_utils.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index e96bf40bb..e5757e954 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -261,7 +261,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI if err != nil { return nil, err } + temp.TemplateID = param.FreightId _, err = dao.UpdateEntity(db, &temp, "TemplateID") + globals.SugarLogger.Debugf("================err:= %s", utils.Format4Output(err, false)) } if temp.TradeLimitID != 0 { param.SaleLimitId = temp.TradeLimitID @@ -271,7 +273,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI if err != nil { return nil, err } + temp.TradeLimitID = param.SaleLimitId _, err = dao.UpdateEntity(db, &temp, "TradeLimitID") + globals.SugarLogger.Debugf("================2err:= %s", utils.Format4Output(err, false)) } } From 947be09edaa4c8173af9ecee1996b86a450fa82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:31:38 +0800 Subject: [PATCH 10/13] 1 --- business/partner/purchase/tiktok_store/store_sku2_utils.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index e5757e954..c5763275f 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -259,9 +259,11 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 运费模板 param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) if err != nil { + globals.SugarLogger.Debugf("=========FreightId=======err:= %s", utils.Format4Output(err, false)) return nil, err } temp.TemplateID = param.FreightId + globals.SugarLogger.Debugf("================temp:= %s", utils.Format4Output(temp, false)) _, err = dao.UpdateEntity(db, &temp, "TemplateID") globals.SugarLogger.Debugf("================err:= %s", utils.Format4Output(err, false)) } From 3f3fb5f106cfb18c977d7b9243cdaa8b47e20c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:35:20 +0800 Subject: [PATCH 11/13] 1 --- business/partner/purchase/tiktok_store/store_sku2_utils.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index c5763275f..46bb36bfc 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -264,7 +264,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } temp.TemplateID = param.FreightId globals.SugarLogger.Debugf("================temp:= %s", utils.Format4Output(temp, false)) - _, err = dao.UpdateEntity(db, &temp, "TemplateID") + _, err = dao.UpdateEntity(db, temp, "TemplateID") globals.SugarLogger.Debugf("================err:= %s", utils.Format4Output(err, false)) } if temp.TradeLimitID != 0 { @@ -276,7 +276,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI return nil, err } temp.TradeLimitID = param.SaleLimitId - _, err = dao.UpdateEntity(db, &temp, "TradeLimitID") + _, err = dao.UpdateEntity(db, temp, "TradeLimitID") globals.SugarLogger.Debugf("================2err:= %s", utils.Format4Output(err, false)) } } From b5bd39e653ded096e36814efe1df885229ab6279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:42:57 +0800 Subject: [PATCH 12/13] 1 --- business/model/dao/store.go | 13 +++++++++++++ .../purchase/tiktok_store/store_sku2_utils.go | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 08dc20850..b4f71b18d 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1564,11 +1564,17 @@ func GetStoreBrandInfos(storeID int) (date *BrandInfos, err error) { return detail, err } +var FreightTemplateMap = make(map[int]*model.FreightTemplate) + // 查询FreightTemplate func QueryStoreBindInfo(storeID int) (*model.FreightTemplate, error) { if storeID == model.NO { return nil, errors.New("storeId 不能为0") } + if _, ok := FreightTemplateMap[storeID]; ok { + return FreightTemplateMap[storeID], nil + } + var ( sqlParams []interface{} bindInfo *model.FreightTemplate @@ -1579,6 +1585,13 @@ func QueryStoreBindInfo(storeID int) (*model.FreightTemplate, error) { if err := GetRow(GetDB(), &bindInfo, sql, sqlParams...); err != nil { return nil, err } + FreightTemplateMap[storeID] = bindInfo + + defer func() { + if time.Now().Unix()%20*60 == 0 { + FreightTemplateMap = nil + } + }() return bindInfo, nil } diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 46bb36bfc..f2304a5c5 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -229,8 +229,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 创建子商品 temp, err := dao.QueryStoreBindInfo(storeDetail.Store.ID) - globals.SugarLogger.Debugf("================temp:= %s", utils.Format4Output(temp, false)) - globals.SugarLogger.Debugf("================storeDetail:= %s", utils.Format4Output(storeDetail, false)) if err != nil || temp == nil || temp.ID == 0 { // 运费模板 param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) @@ -259,13 +257,10 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI // 运费模板 param.FreightId, err = GetDeliveryTemp(api, vendorStoreID, storeDetail) if err != nil { - globals.SugarLogger.Debugf("=========FreightId=======err:= %s", utils.Format4Output(err, false)) return nil, err } temp.TemplateID = param.FreightId - globals.SugarLogger.Debugf("================temp:= %s", utils.Format4Output(temp, false)) _, err = dao.UpdateEntity(db, temp, "TemplateID") - globals.SugarLogger.Debugf("================err:= %s", utils.Format4Output(err, false)) } if temp.TradeLimitID != 0 { param.SaleLimitId = temp.TradeLimitID @@ -277,7 +272,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } temp.TradeLimitID = param.SaleLimitId _, err = dao.UpdateEntity(db, temp, "TradeLimitID") - globals.SugarLogger.Debugf("================2err:= %s", utils.Format4Output(err, false)) } } From 5efb824c914b250c68f0eeb463c81e95aa38c210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 15 Nov 2022 15:45:04 +0800 Subject: [PATCH 13/13] 1 --- business/model/dao/store.go | 6 ------ business/partner/purchase/tiktok_store/store_sku2_utils.go | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index b4f71b18d..ef02f6ea2 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1586,12 +1586,6 @@ func QueryStoreBindInfo(storeID int) (*model.FreightTemplate, error) { return nil, err } FreightTemplateMap[storeID] = bindInfo - - defer func() { - if time.Now().Unix()%20*60 == 0 { - FreightTemplateMap = nil - } - }() return bindInfo, nil } diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index f2304a5c5..31b10cc6c 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -261,6 +261,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } temp.TemplateID = param.FreightId _, err = dao.UpdateEntity(db, temp, "TemplateID") + dao.FreightTemplateMap[temp.StoreID] = temp } if temp.TradeLimitID != 0 { param.SaleLimitId = temp.TradeLimitID @@ -272,6 +273,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } temp.TradeLimitID = param.SaleLimitId _, err = dao.UpdateEntity(db, temp, "TradeLimitID") + dao.FreightTemplateMap[temp.StoreID] = temp } }