liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2022-10-10 16:29:33 +08:00
parent 071114f8e3 34c92de943
commit 6d90a69ae7
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
business/partner/purchase/tiktok_store/store.go
View File

@@ -84,7 +84,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
fences []string fences []string
lists []shop_batchCreateStore_request.StoreListItem lists []shop_batchCreateStore_request.StoreListItem
ShopBatchCreateStoreParam *shop_batchCreateStore_request.ShopBatchCreateStoreParam ShopBatchCreateStoreParam *shop_batchCreateStore_request.ShopBatchCreateStoreParam
FreightTemplate *model.FreightTemplate FreightTemplate = &model.FreightTemplate{}
) )
errList := errlist.New() errList := errlist.New()
//a:=getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID) //a:=getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID)
@@ -126,26 +126,33 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
} }
for k, v := range resp.ResultList { for k, v := range resp.ResultList {
if k != len(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)) globals.SugarLogger.Debug("Success createStore and return storeID=====", resp.ResultList[0].Store.StoreId, utils.Str2Int(storeIDs))
if utils.Str2Int(storeIDs) == 0 { if utils.Str2Int(storeIDs) == 0 {
errList.AddErr(fmt.Errorf("storeIDs=0 %v", err)) errList.AddErr(fmt.Errorf("storeIDs=0 %v", err))
//return "", errors.New(fmt.Sprintf("创建店铺失败原因storeIDs = 0:%v,%v", err, resp.ResultList[0].Msg)) //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) freightTemplateID, err := CreateFreightTemplate(storeDetail.Store.ID)
if err != nil { if err != nil {
errList.AddErr(fmt.Errorf("创建运费模板失败原因：%v", err)) errList.AddErr(fmt.Errorf("创建运费模板失败原因：%v", err))
} else { } 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) err = P.ShopBindStoreFreight(int64(storeDetail.Store.ID), freightTemplateID)
if err != nil { if err != nil {
errList.AddErr(fmt.Errorf("门店：%d 绑定运费模板:%d 失败原因：%v", int64(storeDetail.Store.ID), freightTemplateID, err)) errList.AddErr(fmt.Errorf("门店：%d 绑定运费模板:%d 失败原因：%v", int64(storeDetail.Store.ID), freightTemplateID, err))
} else { } else {
FreightTemplate.TemplateID = freightTemplateID FreightTemplate.TemplateID = freightTemplateID
_, err := dao.UpdateEntity(db, FreightTemplate, "TemplateID") err := dao.CreateEntity(db, FreightTemplate)
if err != nil { if err != nil {
errList.AddErr(fmt.Errorf("运费模板ID存入数据库失败原因：%v", err)) errList.AddErr(fmt.Errorf("运费模板ID存入数据库失败原因：%v", err))
} }
@@ -162,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)) errList.AddErr(fmt.Errorf("门店：%d 绑定仓库:%d 失败原因：%v", int64(storeDetail.Store.ID), warehouse, err))
} else { } else {
FreightTemplate.WarehouseID = warehouse FreightTemplate.WarehouseID = warehouse
_, err := dao.UpdateEntity(db, FreightTemplate, "WarehouseID") err := dao.CreateEntity(db, FreightTemplate)
//_, err := dao.UpdateEntity(db, FreightTemplate, "WarehouseID")
if err != nil { if err != nil {
errList.AddErr(fmt.Errorf("仓库ID存入数据库失败原因：%v", err)) errList.AddErr(fmt.Errorf("仓库ID存入数据库失败原因：%v", err))
} }
@@ -177,21 +185,24 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
errList.AddErr(fmt.Errorf("门店：%d 绑定电子围栏:%d 失败原因：%v", int64(storeDetail.Store.ID), warehouse, err)) errList.AddErr(fmt.Errorf("门店：%d 绑定电子围栏:%d 失败原因：%v", int64(storeDetail.Store.ID), warehouse, err))
} else { } else {
FreightTemplate.FenceID = fenceID FreightTemplate.FenceID = fenceID
_, err := dao.UpdateEntity(db, FreightTemplate, "FenceID") err := dao.CreateEntity(db, FreightTemplate)
//_, err := dao.UpdateEntity(db, FreightTemplate, "FenceID")
if err != nil { if err != nil {
errList.AddErr(fmt.Errorf("电子围栏ID存入数据库失败原因：%v", err)) errList.AddErr(fmt.Errorf("电子围栏ID存入数据库失败原因：%v", err))
} }
} }
} }
globals.SugarLogger.Debug("CreateStore2 return storeIDs==========", storeIDs) storeIDs = "65312663"
globals.SugarLogger.Debug("CreateStore2 return storeIDs, storeDetail.Store.ID==========", storeIDs, storeDetail.Store.ID)
FreightTemplate.StoreID = storeDetail.Store.ID FreightTemplate.StoreID = storeDetail.Store.ID
FreightTemplate.VendorStoreID = storeIDs 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 { if err != nil {
errList.AddErr(fmt.Errorf("db update storeID,vendorStoreID defeat on :%v", err)) 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)) return storeIDs, errors.New(fmt.Sprintf("%v", &errList))
} }
} }