From 1a836ef40c510fcb3084e5dc4777e3d23f1b8d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 14 May 2020 10:01:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 1 - 1 file changed, 1 deletion(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 810e68296..88e899361 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -738,7 +738,6 @@ func (c *OrderManager) RefreshHistoryOrdersEarningPrice(ctx *jxcontext.Context, task := tasksch.NewParallelTask("刷新历史订单结算价", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { order := batchItemList[0].(*model.GoodsOrder) - fmt.Println("test333333333333333333333333333333", order.VendorOrderID) db := dao.GetDB() updateSingleOrderEarningPrice(order, db) dao.Begin(db) From 37d7217578f54b823ac2dcaf9cc3fdcb49ad3145 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Tue, 19 May 2020 20:40:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=BE=8E=E5=9B=A2?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/mtwm/store.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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, // 美团好像地址也不能改的? From 582d9eb5057d40f6e95a3d3394bf6851db42121e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 20 May 2020 09:37:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E5=95=86=E5=9F=8E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sync_store_sku.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index 2ccf2ea58..f71e4afd6 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 // 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改