diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 268434bf3..615bc7e38 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -998,6 +998,8 @@ func getGetStoresSkusBaseSQL2(db *dao.DaoDB, storeIDs, skuIDs []int, upcs []stri } func GetStoresSkus(ctx *jxcontext.Context, storeIDs, skuIDs []int, upcs []string, isFocus, isHighPrice bool, priceType int, keyword string, isBySku, isAct bool, params map[string]interface{}, offset, pageSize int) (skuNamesInfo *dao.StoreSkuNamesInfo, err error) { + // 获取门店品牌如果门店不是b2b品牌则不展示b2b商品 + // 管理员进入 //if /*permission.IsRoled(ctx)*/ true { // // 获取管理员绑定门店 diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index b41b22f6c..bfe0095e5 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -48,6 +48,7 @@ type SkuStoreCatInfo struct { StoreParentCatName string IsSysCat int CityCode int + BrandId int IsJxCat int VendorCategoryName string @@ -430,7 +431,7 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level in tsp.store_category_name store_parent_cat_name, t5p.id parent_map_id, t5p.%s_id parent_vendor_cat_id, t5p.%s_sync_status parent_cat_sync_status, t1.is_sys_cat, t1.vendor_org_code, - t6.city_code + t6.city_code , t6.brand_id FROM store_sku_category_map t5 JOIN sku_category t4 ON t5.category_id = t4.id LEFT JOIN store_category_map ts ON ts.store_id = t5.store_id AND ts.category_id = t4.id AND ts.deleted_at = ? @@ -470,7 +471,17 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level in if err = GetRows(db, &cats, fmt.Sprintf(sql, fieldPrefixParams...), sqlParams...); err != nil { return nil, err } - return cats, err + + // 门店分类采用京西基础分类,且门店为京西品牌之下,排除b2b菜单 + result := make([]*SkuStoreCatInfo, 0, 0) + for _, v := range cats { + if v.BrandId == 1 { // 京西菜市才做此判断 + if !strings.HasPrefix(v.ParentCatName, "B2B") { + result = append(result, v) + } + } + } + return result, err } func GetDirtyStoreCategories(db *DaoDB, vendorID, storeID int, level int, skuIDs []int) (cats []*SkuStoreCatInfo, err error) { diff --git a/business/model/store.go b/business/model/store.go index 232c5b093..5f3d08a0d 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -8,10 +8,10 @@ import ( const ( StoreStatusAll = -9 - StoreStatusDisabled = -2 - StoreStatusClosed = -1 + StoreStatusDisabled = -2 // 禁用 + StoreStatusClosed = -1 // 休息 StoreStatusHaveRest = 0 - StoreStatusOpened = 1 + StoreStatusOpened = 1 // 营业 StoreIsSyncAll = -1 StoreIsSyncNo = 0 diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go index 3f4ba9a3b..a5884dab5 100644 --- a/business/partner/purchase/jdshop/store.go +++ b/business/partner/purchase/jdshop/store.go @@ -186,13 +186,16 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin }, } } - store1:= fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(ebai):%d", storeID,store.Name, 100, store.Status, jxutils.MergeStoreStatus(store.Status, store.VendorStatus),store.VendorOrgCode) + store1:= fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(京东):%d", storeID,store.Name, 0, store.Status, jxutils.MergeStoreStatus(store.Status, store.VendorStatus),store.VendorOrgCode) event.AddOperateEvent(jxcontext.AdminCtx,jxcontext.AdminCtx.GetTrackInfo(), store1, "", "", 10, "UpdateStore") err = getAPI("2").UpdateBasic(param) - } +} if store.SyncStatus&model.SyncFlagStoreStatus != 0 { mergedStoreStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus) p.UpdateStoreStatus(jxcontext.AdminCtx, store.VendorOrgCode, storeID, store.VendorStoreID, mergedStoreStatus) + store1:= fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(京东):%d", storeID,store.Name, 100, store.Status, mergedStoreStatus,store.VendorOrgCode) + event.AddOperateEvent(jxcontext.AdminCtx,jxcontext.AdminCtx.GetTrackInfo(), store1, "", "", 10, "UpdateStore") + } if err == nil { err = getAPI("2").UpdateExpand(utils.Str2Int(store.VendorStoreID)) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 77b3c3fef..405f5a05e 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -252,8 +252,8 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin // name = jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM) // } } - store := fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(美团):%d", storeID,remoteStoreInfo.Name, remoteStoreInfo.IsOnline, storeDetail.Status, mergedStoreStatus,storeDetail.VendorOrgCode) - event.AddOperateEvent(jxcontext.AdminCtx,jxcontext.AdminCtx.GetTrackInfo(), store, "", "", 10, "UpdateStore") + store := fmt.Sprintf("门店id:%d,门店名称:%s,第三方门店状态:%d,本地修改前门店状态%d,本地门店修改后状态:%d,第三方平台Id(美团):%d", storeID, remoteStoreInfo.Name, remoteStoreInfo.IsOnline, storeDetail.Status, mergedStoreStatus, storeDetail.VendorOrgCode) + event.AddOperateEvent(jxcontext.AdminCtx, jxcontext.AdminCtx.GetTrackInfo(), store, "", "", 10, "UpdateStore") // openLevel, isOnline := bizStatusJX2Mtwm(mergedStoreStatus) //TODO 美团暂时不用那个电话 phone := storeDetail.Tel1 @@ -353,7 +353,7 @@ func (p *PurchaseHandler) onStoreStatusChanged(msg *mtwmapi.CallbackMsg) (respon response = mtwmapi.Err2CallbackResponse(err, "") // 操作日志(美团外卖) ctx := jxcontext.AdminCtx - store := fmt.Sprintf("美团外卖回调门店改变回调(营业状态/审核状态):门店id:%s,美团门店状态:%d.[121营业,120休息,18上线,19下线]", vendorStoreID, int(utils.Str2Int64(msg.FormData.Get("poi_status")))) + store := fmt.Sprintf("美团外卖回调门店改变回调(营业状态/审核状态):门店id:%s,美团门店状态:%d.[121营业,120休息,18上线,19下线],本地修改后状态[%s]", vendorStoreID, int(utils.Str2Int64(msg.FormData.Get("poi_status"))), storeStatus) event.AddOperateEvent(ctx, ctx.GetTrackInfo(), store, "", "", 10, "UpdateStore") return response } @@ -390,6 +390,8 @@ func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCod } else { err = errors.New("门店还未上线,不能修改营业状态") } + store := fmt.Sprintf("美团外卖回调门店改变回调(营业状态/审核状态):门店id:%s,美团门店状态:%d.[121营业,120休息,18上线,19下线],本地修改后状态[%s]", vendorStoreID, remoteStoreInfo.OpenLevel, openLevel) + event.AddOperateEvent(ctx, ctx.GetTrackInfo(), store, "", "", 10, "UpdateStore") } } } diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index b382258f6..429fcec43 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -161,8 +161,7 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in Sequence: storeCat.Seq, } err = getAPI(storeCat.VendorOrgCode, storeID, vendorStoreID).RetailCatUpdate(vendorStoreID, catName, param4Update) - if storeCat.CatSyncStatus&model.SyncFlagNewMask == 0 && // 修改分类名,但分类不存在 - p.IsErrCategoryNotExist(err) && originName != "" { + if storeCat.CatSyncStatus&model.SyncFlagNewMask == 0 && p.IsErrCategoryNotExist(err) && originName != "" { // 修改分类名,但分类不存在 storeCat.CatSyncStatus |= model.SyncFlagNewMask err = p.CreateStoreCategory(ctx, storeID, vendorStoreID, storeCat) }