diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 6a775d24a..3ceada398 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -10,7 +10,6 @@ import ( "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner/purchase/jd" - "git.rosy.net.cn/jx-callback/business/partner/purchase/jx" "git.rosy.net.cn/jx-callback/globals" ) @@ -233,8 +232,6 @@ func (c *BaseScheduler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID st } } err = jd.CurPurchaseHandler.ConfirmSelfTake(ctx, vendorOrderID, selfTakeCode) - } else if vendorID == model.VendorIDJX { - err = jx.CurPurchaseHandler.ConfirmSelfTake(ctx, vendorOrderID, selfTakeCode) } else { err = fmt.Errorf("自提核销不支持%s平台订单", model.VendorChineseNames[vendorID]) } diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 5d4928dd2..3c782678a 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1511,7 +1511,7 @@ func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, v task := tasksch.NewParallelTask("GetStoresVendorSnapshot", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeMap := batchItemList[0].(*model.StoreMap) - if storeMap.VendorID != model.VendorIDWSC { + if model.IsVendorRemote(storeMap.VendorID) { if handler := partner.GetPurchasePlatformFromVendorID(storeMap.VendorID); handler != nil { store, err2 := handler.ReadStore(ctx, storeMap.VendorStoreID) if err = err2; err == nil { diff --git a/business/model/const.go b/business/model/const.go index 4256a46a0..d055752f7 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -27,7 +27,8 @@ var ( VendorIDMTWM: "美好菜市", VendorIDELM: "好菜鲜生", VendorIDEBAI: "好菜鲜生", - VendorIDWSC: "京西菜市", + VendorIDJX: "京西商城", + VendorIDWSC: "微盟微商城", } OrderStatusName = map[int]string{ @@ -268,7 +269,8 @@ const ( OrderFlagMaskCallPMCourier = 64 // 取货失败后召唤平台配送 OrderFlagMaskSetDelivered = 128 // 设置送达 - OrderFlagMaskFake = 256 // 假订单,即刷单用的 + OrderFlagMaskFake = 256 // 假订单,即刷单用的 + OrderFlagMaskTempJX = 512 // 临时京西订单 ) const ( @@ -340,8 +342,8 @@ func IsOrderImportantStatus(status int) bool { return IsOrderMainStatus(status) || IsOrderLockStatus(status) || IsOrderUnlockStatus(status) } -func IsSpecialVendorID(vendorID int) bool { - return vendorID == VendorIDWSC || vendorID == VendorIDJX +func IsVendorRemote(vendorID int) bool { + return vendorID >= VendorIDJD && vendorID <= VendorIDEBAI } func WaybillVendorID2Mask(vendorID int) (mask int8) { diff --git a/business/partner/purchase/jx/order.go b/business/partner/purchase/jx/order.go index df4c06acd..ac190bf6e 100644 --- a/business/partner/purchase/jx/order.go +++ b/business/partner/purchase/jx/order.go @@ -62,6 +62,7 @@ func (c *PurchaseHandler) onOrderNew(msg *CallbackMsg, subMsgType int, order *Da order.DeliveryType = model.OrderDeliveryTypeStoreSelf order.GoodsOrder.Skus = order.Skus order.VendorID = model.VendorIDJX + order.Flag = model.OrderFlagMaskTempJX for _, v := range order.GoodsOrder.Skus { v.SkuID = int(utils.Str2Int64WithDefault(v.VendorSkuID, 0)) }