diff --git a/business/jxcallback/auto_delivery/auto_delivery.go b/business/jxcallback/auto_delivery/auto_delivery.go index 3ee5dc124..02df8318c 100644 --- a/business/jxcallback/auto_delivery/auto_delivery.go +++ b/business/jxcallback/auto_delivery/auto_delivery.go @@ -129,7 +129,7 @@ func AutoSettingFakeDelivery() { return } } - + globals.SugarLogger.Debugf("===============riderListInfo= : %s", riderKey) randNumber, _ := rand.Int(rand.Reader, big.NewInt(int64(len(riderListInfo[riderKey])))) randTime := randNumber.Int64() if randTime < 0 { diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 70a40fbf1..b4d4a9dbf 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1826,6 +1826,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor dao.Rollback(db, txDB) return 0, err } + isSyncStoreMapSku := false if num > 0 { if globals.IsAddEvent { mapBefore := refutil.FindMapAndStructMixed(valid, beforeStoreMap) @@ -1840,6 +1841,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor dao.Rollback(db, txDB) return 0, err } + isSyncStoreMapSku = true } } else { if valid["pricePercentage"] != nil || valid["pricePercentagePack"] != nil { @@ -1850,7 +1852,27 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor dao.Commit(db, txDB) if isStoreMapNeedSync(vendorID, valid) { _, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName) - globals.SugarLogger.Debug("CurVendorSync.SyncStore:err======%v", err) + } + + // 更新商品 + if isSyncStoreMapSku { + globals.SugarLogger.Debugf("修改门店调价包是同步门店商品价格=============: %v", err) + singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) + task := tasksch.NewParallelTask("修改门店调价包的时候,同时同步门店商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(true), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + step := batchItemList[0].(int) + switch step { + case 1: + if singleStoreHandler != nil { + // 直接同步商品 + err = syncStoreSkuNew(ctx, task, 0, true, vendorID, storeID, "", nil, nil, nil, false, true) + } + } + return retVal, err + }, []int{1}) + tasksch.HandleTask(task, nil, true).Run() + _, err = task.GetResult(0) + return 0, err } } } diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index b488a10f4..c92ddb899 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -522,6 +522,9 @@ func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg, orderStatus *mode }) } } + if handler := partner.GetPurchaseOrderHandlerFromVendorID(model.VendorIDEBAI); handler != nil { + handler.AcceptOrRefuseOrder(order, true, "jxAdmin") + } return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, map[string]interface{}{ "source_order_id": vendorOrderID, })