diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 599a1f1e1..b45ec3994 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -158,17 +158,17 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) (stri errList.AddErr(fmt.Errorf("京西菜市门店:%d 平台门店:%d 绑定运费模板:%d 失败:%v", storeID, vendorStoreID, freightTemplateID, err)) } else { FreightTemplate.TemplateID = freightTemplateID - if err = dao.CreateEntity(db, FreightTemplate); err != nil { - globals.SugarLogger.Debug("运费模板:%d 同步数据库失败:%v", freightTemplateID, err) - errList.AddErr(fmt.Errorf("运费模板:%d 同步数据库失败:%v", freightTemplateID, err)) - } + //if err = dao.CreateEntity(db, FreightTemplate); err != nil { + // globals.SugarLogger.Debug("运费模板:%d 同步数据库失败:%v", freightTemplateID, err) + // errList.AddErr(fmt.Errorf("运费模板:%d 同步数据库失败:%v", freightTemplateID, err)) + //} } } } else { //同步信息到本地 - if _, err = dao.UpdateEntity(db, FreightTemplate, "TemplateID"); err != nil { - globals.SugarLogger.Debug("平台运费模板 同步到本地出错:%v", err) - errList.AddErr(fmt.Errorf("平台运费模板 同步到本地出错:%v", err)) - } + //if _, err = dao.UpdateEntity(db, FreightTemplate, "TemplateID"); err != nil { + // globals.SugarLogger.Debug("平台运费模板 同步到本地出错:%v", err) + // errList.AddErr(fmt.Errorf("平台运费模板 同步到本地出错:%v", err)) + //} } //2.平台获取仓库信息以及电子围栏id @@ -189,12 +189,11 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) (stri errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err)) } else { FreightTemplate.WarehouseID = warehouseID - if err = dao.CreateEntity(db, FreightTemplate); err != nil { - globals.SugarLogger.Debug("仓库ID(%d) 同步到数据库失败:%v", warehouseID, err) - errList.AddErr(fmt.Errorf("仓库ID(%d) 同步到数据库失败:%v", warehouseID, err)) - } + //if err = dao.CreateEntity(db, FreightTemplate); err != nil { + // globals.SugarLogger.Debug("仓库ID(%d) 同步到数据库失败:%v", warehouseID, err) + // errList.AddErr(fmt.Errorf("仓库ID(%d) 同步到数据库失败:%v", warehouseID, err)) + //} } - FreightTemplate.WarehouseID = warehouseID } //(2)创建电子围栏 if fenceID, err := CreateFenceByStore(vendorOrgCode, storeID); err != nil || utils.Str2Int(fenceID) == 0 || utils.IsNil(fenceID) { //不管存在与否 直接创建 @@ -234,14 +233,14 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) (stri } } //同步到本地数据库 - if _, err = dao.UpdateEntity(db, FreightTemplate, "FenceID"); err != nil { - globals.SugarLogger.Debug("电子围栏 同步到本地出错:%v", err) - errList.AddErr(fmt.Errorf("电子围栏 同步到本地出错:%v", err)) - } - if _, err = dao.UpdateEntity(db, FreightTemplate, "WarehouseID"); err != nil { - globals.SugarLogger.Debug("仓库 同步到本地出错:%v", err) - errList.AddErr(fmt.Errorf("仓库 同步到本地出错:%v", err)) - } + //if _, err = dao.UpdateEntity(db, FreightTemplate, "FenceID"); err != nil { + // globals.SugarLogger.Debug("电子围栏 同步到本地出错:%v", err) + // errList.AddErr(fmt.Errorf("电子围栏 同步到本地出错:%v", err)) + //} + //if _, err = dao.UpdateEntity(db, FreightTemplate, "WarehouseID"); err != nil { + // globals.SugarLogger.Debug("仓库 同步到本地出错:%v", err) + // errList.AddErr(fmt.Errorf("仓库 同步到本地出错:%v", err)) + //} } //3.平台获取限售模板 @@ -260,25 +259,35 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) (stri errList.AddErr(fmt.Errorf("门店(%d) 创建限售模板失败:%v", storeID, err)) } else { FreightTemplate.TradeLimitID = tradeLimitID - if err := dao.CreateEntity(db, FreightTemplate); err != nil { - globals.SugarLogger.Debug("限售模板(%d) 存入数据库失败:%v", tradeLimitID, err) - errList.AddErr(fmt.Errorf("限售模板(%d) 存入数据库失败:%v", tradeLimitID, err)) - } + //if err := dao.CreateEntity(db, FreightTemplate); err != nil { + // globals.SugarLogger.Debug("限售模板(%d) 存入数据库失败:%v", tradeLimitID, err) + // errList.AddErr(fmt.Errorf("限售模板(%d) 存入数据库失败:%v", tradeLimitID, err)) + //} } } - } else { //同步到本地 - FreightTemplate.TradeLimitID = SaleLimitID - if _, err = dao.UpdateEntity(db, FreightTemplate, "TradeLimitID"); err != nil { - globals.SugarLogger.Debug("限售模板 同步到本地出错:%v", err) - errList.AddErr(fmt.Errorf("限售模板 同步到本地出错:%v", err)) - } } - FreightTemplate.StoreID = int(storeID) - FreightTemplate.VendorStoreID = utils.Int64ToStr(vendorStoreID) + //else { //同步到本地 + // FreightTemplate.TradeLimitID = SaleLimitID + // if _, err = dao.UpdateEntity(db, FreightTemplate, "TradeLimitID"); err != nil { + // globals.SugarLogger.Debug("限售模板 同步到本地出错:%v", err) + // errList.AddErr(fmt.Errorf("限售模板 同步到本地出错:%v", err)) + // } + //} FreightTemplate.DeletedAt = utils.DefaultTimeValue + FreightTemplate = &model.FreightTemplate{ + StoreID: int(storeID), + VendorStoreID: utils.Int64ToStr(vendorStoreID), + } + if err = dao.CreateEntity(db, FreightTemplate); err != nil { globals.SugarLogger.Debug("db update storeID,vendorStoreID defeat on :%v", err) errList.AddErr(fmt.Errorf("db update storeID,vendorStoreID defeat on :%v", err)) + } else { + _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID") + _, err2 := dao.UpdateEntity(db, FreightTemplate, "WarehouseID") + _, err3 := dao.UpdateEntity(db, FreightTemplate, "FenceID") + _, err4 := dao.UpdateEntity(db, FreightTemplate, "TradeLimitID") + errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v,%v,%v,%v", err1, err2, err3, err4)) } if utils.IsNil(errList) { globals.SugarLogger.Debug("绑定门店需进行的错误处理:%v", errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true)))) diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 9e0f1ae6d..0aeeb8193 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -117,6 +117,7 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e Shape: int32(localStore.DeliveryRangeType), }, } + globals.SugarLogger.Debug("localStore.DeliveryRangeType==============", localStore.DeliveryRangeType) if localStore.DeliveryRangeType == tiktok_api.ShapeCircular { circular := &warehouse_createFence_request.Circular{ Center: &warehouse_createFence_request.Center{