liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into jdshop

Browse Source
This commit is contained in:
苏尹岚
2020-05-20 09:38:04 +08:00
parent 31d1d5983b 582d9eb505
commit 4c11f5c980
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/sync_store_sku.go
View File

@@ -431,6 +431,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
now := jxutils.OperationTime2HourMinuteFormat(time.Now()) now := jxutils.OperationTime2HourMinuteFormat(time.Now())
var failedList []*partner.StoreSkuInfoWithErr var failedList []*partner.StoreSkuInfoWithErr
for _, sku := range skus { for _, sku := range skus {
if vendorID == model.VendorIDJDShop && storeID != model.JdShopMainStoreID {
sku.SkuSyncStatus = model.SyncFlagSaleMask
}
if !useVendorPriceDirectly && if !useVendorPriceDirectly &&
!isSkuLockTimeValid(sku) { !isSkuLockTimeValid(sku) {
sku.VendorPrice = 0 sku.VendorPrice = 0
@@ -483,6 +486,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
} else { } else {
if dao.IsVendorThingIDEmpty(sku.VendorSkuID) { if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
// err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID) // err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID)
if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID) {
err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0) err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0)
failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "异常同步错误") failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "异常同步错误")
if parentTask == nil { if parentTask == nil {
@@ -490,6 +494,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
} }
parentTask.AddBatchErr(err) parentTask.AddBatchErr(err)
parentTask.AddFailedList(failedList) parentTask.AddFailedList(failedList)
}
} else { } else {
isAdded2Update := false isAdded2Update := false
// 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改 // 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改

13
business/partner/purchase/mtwm/store.go
View File

@@ -130,12 +130,13 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
// } // }
} }
// openLevel, isOnline := bizStatusJX2Mtwm(mergedStoreStatus) // openLevel, isOnline := bizStatusJX2Mtwm(mergedStoreStatus)
phone := "" //TODO 美团暂时不用那个电话
if storeDetail.MarketManPhone != "" { phone := storeDetail.Tel1
phone = storeDetail.MarketManPhone // if storeDetail.MarketManPhone != "" {
} else { // phone = storeDetail.MarketManPhone
phone = model.VendorStoreTel // } else {
} // phone = model.VendorStoreTel
// }
params := map[string]interface{}{ params := map[string]interface{}{
"name": name, //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), "name": name, //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM),
"address": storeDetail.Address, // 美团好像地址也不能改的? "address": storeDetail.Address, // 美团好像地址也不能改的?