From 2af05750d21f2479acb9d9fc9e6bed9f6a5db47f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 15:08:57 +0800 Subject: [PATCH 01/11] 1 --- business/partner/purchase/tiktok_store/store.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 294e1327a..8ac8f8b78 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -126,9 +126,10 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } for k, v := range resp.ResultList { if k != len(resp.ResultList) { - storeIDs += utils.Int64ToStr(v.Store.StoreId) + "," + storeIDs = utils.Int64ToStr(v.Store.StoreId) + "," } - storeIDs += utils.Int64ToStr(v.Store.StoreId) + storeIDs = utils.Int64ToStr(v.Store.StoreId) + } globals.SugarLogger.Debug("Success createStore and return storeID=====", resp.ResultList[0].Store.StoreId, utils.Str2Int(storeIDs)) if utils.Str2Int(storeIDs) == 0 { @@ -140,6 +141,10 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri if err != nil { errList.AddErr(fmt.Errorf("创建运费模板失败原因：%v", err)) } else { + if freightTemplateID == 0 { + globals.SugarLogger.Debug("freightTemplateID=========", freightTemplateID) + errList.AddErr(fmt.Errorf(" ", int64(storeDetail.Store.ID), freightTemplateID, err)) + } err = P.ShopBindStoreFreight(int64(storeDetail.Store.ID), freightTemplateID) if err != nil { errList.AddErr(fmt.Errorf("门店：%d 绑定运费模板:%d 失败原因：%v", int64(storeDetail.Store.ID), freightTemplateID, err)) From 3c2e64ec7e4cb2a4cdbdf7cfa2cf0890ef848c82 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 15:19:41 +0800 Subject: [PATCH 02/11] 1 --- business/partner/purchase/tiktok_store/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 8ac8f8b78..8b8995fb9 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -137,6 +137,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri //return "", errors.New(fmt.Sprintf("创建店铺失败原因storeIDs = 0:%v,%v", err, resp.ResultList[0].Msg)) } //创建并绑定运费模板 + globals.SugarLogger.Debug("storeDetail.Store.ID==============", storeDetail.Store.ID) freightTemplateID, err := CreateFreightTemplate(storeDetail.Store.ID) if err != nil { errList.AddErr(fmt.Errorf("创建运费模板失败原因：%v", err)) From b31a2e697ed15cfebec3c2c1be53c6242dfbb808 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 15:24:24 +0800 Subject: [PATCH 03/11] 1 --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 8b8995fb9..bf6f292c8 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -189,9 +189,9 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } } } - globals.SugarLogger.Debug("CreateStore2 return storeIDs==========", storeIDs) FreightTemplate.StoreID = storeDetail.Store.ID FreightTemplate.VendorStoreID = storeIDs + globals.SugarLogger.Debug("CreateStore2 return storeIDs,FreightTemplate.StoreID==========", storeIDs, FreightTemplate.StoreID) _, err = dao.UpdateEntity(db, FreightTemplate, "StoreID", "VendorStoreID") if err != nil { errList.AddErr(fmt.Errorf("db update storeID,vendorStoreID defeat on :%v", err)) From 6b5f8213364301efd3cdb680d61fc61852835baa Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 15:26:49 +0800 Subject: [PATCH 04/11] 1 --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index bf6f292c8..229336e5b 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -189,9 +189,9 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } } } + globals.SugarLogger.Debug("CreateStore2 return storeIDs, storeDetail.Store.ID==========", storeIDs, storeDetail.Store.ID) FreightTemplate.StoreID = storeDetail.Store.ID FreightTemplate.VendorStoreID = storeIDs - globals.SugarLogger.Debug("CreateStore2 return storeIDs,FreightTemplate.StoreID==========", storeIDs, FreightTemplate.StoreID) _, err = dao.UpdateEntity(db, FreightTemplate, "StoreID", "VendorStoreID") if err != nil { errList.AddErr(fmt.Errorf("db update storeID,vendorStoreID defeat on :%v", err)) From 1863b522ed04382317f5229e10ff030b853480c8 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 15:30:49 +0800 Subject: [PATCH 05/11] 1 --- business/partner/purchase/tiktok_store/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 229336e5b..d56180e19 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -189,6 +189,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } } } + //storeIDs = globals.SugarLogger.Debug("CreateStore2 return storeIDs, storeDetail.Store.ID==========", storeIDs, storeDetail.Store.ID) FreightTemplate.StoreID = storeDetail.Store.ID FreightTemplate.VendorStoreID = storeIDs From 4f37afbcdc65685ca28c8545c6d55fbfdc1f0ea8 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 15:38:59 +0800 Subject: [PATCH 06/11] 1 --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index d56180e19..73cd287c3 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -84,7 +84,6 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri fences []string lists []shop_batchCreateStore_request.StoreListItem ShopBatchCreateStoreParam *shop_batchCreateStore_request.ShopBatchCreateStoreParam - FreightTemplate *model.FreightTemplate ) errList := errlist.New() //a:=getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID) @@ -136,6 +135,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri errList.AddErr(fmt.Errorf("storeIDs=0 %v", err)) //return "", errors.New(fmt.Sprintf("创建店铺失败原因storeIDs = 0:%v,%v", err, resp.ResultList[0].Msg)) } + var FreightTemplate *model.FreightTemplate //创建并绑定运费模板 globals.SugarLogger.Debug("storeDetail.Store.ID==============", storeDetail.Store.ID) freightTemplateID, err := CreateFreightTemplate(storeDetail.Store.ID) From a32b9ba980dbc0b3338ce24b1adc418b29c62fc9 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 15:43:41 +0800 Subject: [PATCH 07/11] 1 --- business/partner/purchase/tiktok_store/store.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 73cd287c3..b2243c900 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -135,7 +135,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri errList.AddErr(fmt.Errorf("storeIDs=0 %v", err)) //return "", errors.New(fmt.Sprintf("创建店铺失败原因storeIDs = 0:%v,%v", err, resp.ResultList[0].Msg)) } - var FreightTemplate *model.FreightTemplate + var FreightTemplate model.FreightTemplate //创建并绑定运费模板 globals.SugarLogger.Debug("storeDetail.Store.ID==============", storeDetail.Store.ID) freightTemplateID, err := CreateFreightTemplate(storeDetail.Store.ID) @@ -189,7 +189,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } } } - //storeIDs = + storeIDs = "65312663" globals.SugarLogger.Debug("CreateStore2 return storeIDs, storeDetail.Store.ID==========", storeIDs, storeDetail.Store.ID) FreightTemplate.StoreID = storeDetail.Store.ID FreightTemplate.VendorStoreID = storeIDs From e05d03777d97d4ddb76ffc4b043129ba24ec339c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 15:53:42 +0800 Subject: [PATCH 08/11] 1 --- business/partner/purchase/tiktok_store/store.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index b2243c900..55f9b6660 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -84,6 +84,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri fences []string lists []shop_batchCreateStore_request.StoreListItem ShopBatchCreateStoreParam *shop_batchCreateStore_request.ShopBatchCreateStoreParam + FreightTemplate *model.FreightTemplate ) errList := errlist.New() //a:=getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID) @@ -135,7 +136,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri errList.AddErr(fmt.Errorf("storeIDs=0 %v", err)) //return "", errors.New(fmt.Sprintf("创建店铺失败原因storeIDs = 0:%v,%v", err, resp.ResultList[0].Msg)) } - var FreightTemplate model.FreightTemplate + //创建并绑定运费模板 globals.SugarLogger.Debug("storeDetail.Store.ID==============", storeDetail.Store.ID) freightTemplateID, err := CreateFreightTemplate(storeDetail.Store.ID) @@ -151,7 +152,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri errList.AddErr(fmt.Errorf("门店：%d 绑定运费模板:%d 失败原因：%v", int64(storeDetail.Store.ID), freightTemplateID, err)) } else { FreightTemplate.TemplateID = freightTemplateID - _, err := dao.UpdateEntity(db, FreightTemplate, "TemplateID") + err := dao.CreateEntity(db, FreightTemplate) if err != nil { errList.AddErr(fmt.Errorf("运费模板ID存入数据库失败原因：%v", err)) } @@ -168,7 +169,8 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri errList.AddErr(fmt.Errorf("门店：%d 绑定仓库:%d 失败原因：%v", int64(storeDetail.Store.ID), warehouse, err)) } else { FreightTemplate.WarehouseID = warehouse - _, err := dao.UpdateEntity(db, FreightTemplate, "WarehouseID") + err := dao.CreateEntity(db, FreightTemplate) + //_, err := dao.UpdateEntity(db, FreightTemplate, "WarehouseID") if err != nil { errList.AddErr(fmt.Errorf("仓库ID存入数据库失败原因：%v", err)) } @@ -183,7 +185,8 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri errList.AddErr(fmt.Errorf("门店：%d 绑定电子围栏:%d 失败原因：%v", int64(storeDetail.Store.ID), warehouse, err)) } else { FreightTemplate.FenceID = fenceID - _, err := dao.UpdateEntity(db, FreightTemplate, "FenceID") + err := dao.CreateEntity(db, FreightTemplate) + //_, err := dao.UpdateEntity(db, FreightTemplate, "FenceID") if err != nil { errList.AddErr(fmt.Errorf("电子围栏ID存入数据库失败原因：%v", err)) } @@ -193,7 +196,8 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri globals.SugarLogger.Debug("CreateStore2 return storeIDs, storeDetail.Store.ID==========", storeIDs, storeDetail.Store.ID) FreightTemplate.StoreID = storeDetail.Store.ID FreightTemplate.VendorStoreID = storeIDs - _, err = dao.UpdateEntity(db, FreightTemplate, "StoreID", "VendorStoreID") + err = dao.CreateEntity(db, FreightTemplate) + //_, err = dao.UpdateEntity(db, FreightTemplate, "StoreID", "VendorStoreID") if err != nil { errList.AddErr(fmt.Errorf("db update storeID,vendorStoreID defeat on :%v", err)) } From fdad9362a8accc60bc2c4784531742cbcf18038a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 16:05:00 +0800 Subject: [PATCH 09/11] 1 --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 55f9b6660..8aa59bc4b 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -84,7 +84,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri fences []string lists []shop_batchCreateStore_request.StoreListItem ShopBatchCreateStoreParam *shop_batchCreateStore_request.ShopBatchCreateStoreParam - FreightTemplate *model.FreightTemplate + FreightTemplate = &model.FreightTemplate{} ) errList := errlist.New() //a:=getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID) From e22da868a859853af6f89a57df248d975aa17911 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 16:08:32 +0800 Subject: [PATCH 10/11] 1 --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 8aa59bc4b..4e15766e1 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -201,7 +201,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri if err != nil { errList.AddErr(fmt.Errorf("db update storeID,vendorStoreID defeat on :%v", err)) } - globals.SugarLogger.Debug("CreateStore last step success..................") + globals.SugarLogger.Debug("CreateStore last step success..................but errList====%v", errList) return storeIDs, errors.New(fmt.Sprintf("%v", errList)) } } From 34c92de9434431b6c333cbee4276bc0b31712b23 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Oct 2022 16:26:03 +0800 Subject: [PATCH 11/11] 1 --- business/partner/purchase/tiktok_store/store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 4e15766e1..4d5b42adb 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -202,7 +202,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri errList.AddErr(fmt.Errorf("db update storeID,vendorStoreID defeat on :%v", err)) } globals.SugarLogger.Debug("CreateStore last step success..................but errList====%v", errList) - return storeIDs, errors.New(fmt.Sprintf("%v", errList)) + return storeIDs, errors.New(fmt.Sprintf("%v", &errList)) } }