diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index b3f6caf1f..d94ea40b5 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -92,7 +92,6 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri if storeDetail.OpenTime1 == 0 || storeDetail.CloseTime1 == 0 { return "", fmt.Errorf("营业时间必填") } else { - globals.SugarLogger.Debug("storeDetail.OpenTime1, storeDetail.CloseTime1======", storeDetail.OpenTime1, storeDetail.CloseTime1) timeStr = SplicingTimeToDoudian(storeDetail.OpenTime1, storeDetail.CloseTime1, storeDetail.OpenTime2, storeDetail.CloseTime2) } m := make(map[int64]string) @@ -132,7 +131,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } globals.SugarLogger.Debug("Success createStore and return storeID=====", resp.ResultList[0].Store.StoreId, utils.Str2Int(storeIDs)) if utils.Str2Int(storeIDs) == 0 { - 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)) } //创建并绑定运费模板 if freightTemplateID, err := CreateFreightTemplate(storeDetail.Store.ID); err != nil { @@ -142,25 +141,25 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri errList.AddErr(fmt.Errorf("创建运费模板失败:%v", err)) } if err = ShopBindStoreFreight(storeDetail.VendorOrgCode, int64(storeDetail.Store.ID), freightTemplateID); 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 { FreightTemplate.TemplateID = freightTemplateID if err = dao.CreateEntity(db, FreightTemplate); err != nil { - errList.AddErr(fmt.Errorf("运费模板ID存入数据库失败原因:%v", err)) + errList.AddErr(fmt.Errorf("运费模板ID存入数据库失败:%v", err)) } } } //创建并绑定仓库 if warehouse, err := CreateWarehouse(storeDetail.VendorOrgCode, utils.Int2Str(storeDetail.Store.ID)); err != nil { - errList.AddErr(fmt.Errorf("创建仓库失败原因:%v", err)) + errList.AddErr(fmt.Errorf("创建仓库失败:%v", err)) } else { tempStoreID = append(tempStoreID, int64(storeDetail.Store.ID)) if err = BindStoreWarehouse(storeDetail.VendorOrgCode, utils.Int64ToStr(warehouse), tempStoreID); err != nil { - 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 { FreightTemplate.WarehouseID = warehouse if err = dao.CreateEntity(db, FreightTemplate); err != nil { - errList.AddErr(fmt.Errorf("仓库ID存入数据库失败原因:%v", err)) + errList.AddErr(fmt.Errorf("仓库ID存入数据库失败:%v", err)) } } } @@ -275,7 +274,7 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin return errors.New(fmt.Sprintf("更新运费模板失败,原因:%v", err)) } //更新电子围栏 - err = UpdateFenceByStore(storeID) + err = UpdateFenceByStore(storeInfo.VendorOrgCode, storeID) if err != nil { return errors.New(fmt.Sprintf("更新电子围栏失败,原因:%v", err)) } @@ -286,9 +285,7 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin // UpdateStoreStatus shop/unsuspendStore 门店恢复营业 func (p *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, status int) (err error) { - globals.SugarLogger.Debug("================2", 1) isOnline := bizStatusJX2DouDian(status) - globals.SugarLogger.Debug("================2", isOnline) api := getAPI(vendorOrgCode, storeID, vendorStoreID) if globals.EnableDdStoreWrite { if isOnline != tiktok_api.StoreStatusOnline { //暂停营业状态 @@ -461,7 +458,7 @@ func ShopBindStoreFreight(vendorOrgCode string, storeID, freightID int64) error StoreId: storeID, FreightId: freightID, } - api := getAPI("", int(storeID), "") + api := getAPI(vendorOrgCode, int(storeID), "") err := api.BindFreightTemplate(param) if err != nil { return err @@ -549,7 +546,7 @@ func CreateTradeLimitTemplate(appOrgCode string, storeID int64) (tradeLimitID in StoreId: storeID, TradeLimitRuleRequestList: items, } - resp, err := getAPI("", 0, utils.Int64ToStr(storeID)).CreateTradeLimitTemplate(param) + resp, err := getAPI(appOrgCode, 0, utils.Int64ToStr(storeID)).CreateTradeLimitTemplate(param) if err != nil { return 0, err } diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index d44c405b8..6a9e79a64 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -147,7 +147,7 @@ func CreateFenceDirectly(param warehouse_createFence_request.WarehouseCreateFenc } // 通过门店更新电子围栏 -func UpdateFenceByStore(storeID int) error { +func UpdateFenceByStore(appOrgCode string, storeID int) error { var ( db *dao.DaoDB localStore *LocalStore @@ -157,8 +157,7 @@ func UpdateFenceByStore(storeID int) error { model.VendorIDDD, } sqlStr := ` SELECT t.lng,t.lat,t.delivery_range_type,t.delivery_range,s.vendor_store_id FROM store t - LEFT JOIN store_map s ON t.id = s.store_id - WHERE s.vendor_id= ? ` + LEFT JOIN store_map s ON t.id = s.store_id WHERE s.vendor_id= ? ` if storeID != 0 { sqlStr += " AND t.id = ? " sqlParam = append(sqlParam, storeID)