diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index b9f2fe47b..d260eee90 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -431,6 +431,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag now := jxutils.OperationTime2HourMinuteFormat(time.Now()) var failedList []*partner.StoreSkuInfoWithErr for _, sku := range skus { + if vendorID == model.VendorIDJDShop && storeID != model.JdShopMainStoreID { + sku.SkuSyncStatus = model.SyncFlagSaleMask + } if !useVendorPriceDirectly && !isSkuLockTimeValid(sku) { sku.VendorPrice = 0 @@ -483,13 +486,15 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else { if dao.IsVendorThingIDEmpty(sku.VendorSkuID) { // err = fmt.Errorf("门店:%d,修改没有创建的商品:%d", storeID, sku.SkuID) - err = utils.NewErrorCode(fmt.Sprintf("门店:%d,修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0) - failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "异常同步错误") - if parentTask == nil { - return err + if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID) { + err = utils.NewErrorCode(fmt.Sprintf("门店:%d,修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0) + failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "异常同步错误") + if parentTask == nil { + return err + } + parentTask.AddBatchErr(err) + parentTask.AddFailedList(failedList) } - parentTask.AddBatchErr(err) - parentTask.AddFailedList(failedList) } else { isAdded2Update := false // 修改商品信息时不改价(以免活动引起的失败),而用单独的改价来改 diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 8ffdd3060..c834465d2 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -130,12 +130,13 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin // } } // openLevel, isOnline := bizStatusJX2Mtwm(mergedStoreStatus) - phone := "" - if storeDetail.MarketManPhone != "" { - phone = storeDetail.MarketManPhone - } else { - phone = model.VendorStoreTel - } + //TODO 美团暂时不用那个电话 + phone := storeDetail.Tel1 + // if storeDetail.MarketManPhone != "" { + // phone = storeDetail.MarketManPhone + // } else { + // phone = model.VendorStoreTel + // } params := map[string]interface{}{ "name": name, //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), "address": storeDetail.Address, // 美团好像地址也不能改的?