diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index b5a4ca2b7..49e3cf5b7 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -170,8 +170,8 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac } storeIDs := jxutils.IntMap2List(storeIDMap) skuIDs := jxutils.IntMap2List(skuIDMap) - - if act.OverlapRule == model.OverlapRuleNormal { + // 判断活动是否重叠的检查,当前忽略京东平台及所有结算信息 + if act.OverlapRule == model.OverlapRuleNormal && act.Type != model.ActSkuFake { effectActStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(db, 0, vendorIDs, act.Type, storeIDs, skuIDs, act.BeginAt, act.EndAt) if err != nil { globals.SugarLogger.Errorf("GetEffectiveActStoreSkuInfo can not get sku promotion info for error:%v", err) diff --git a/business/partner/purchase/ebai/waybill.go b/business/partner/purchase/ebai/waybill.go index 8a8f551ba..b8c202914 100644 --- a/business/partner/purchase/ebai/waybill.go +++ b/business/partner/purchase/ebai/waybill.go @@ -42,7 +42,7 @@ func (p *PurchaseHandler) GetWaybillStatusFromVendorStatus(vendorStatus string) func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiapi.CallbackResponse) { order := c.callbackMsg2Waybill(msg) globals.SugarLogger.Debugf("ebai onWaybillMsg orderID:%s", order.VendorOrderID) - if order.Status == model.WaybillStatusAccepted { + if order.Status == model.WaybillStatusNew || order.Status == model.WaybillStatusAccepted { // 饿百新运单事件要查询快递员信息,因为可能事件错序 if result, err := api.EbaiAPI.OrderDeliveryGet(order.VendorOrderID); err != nil { globals.SugarLogger.Warnf("ebai onWaybillMsg orderID:%s OrderDeliveryGet failed with error:%v", order.VendorOrderID, err) return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, order.VendorOrderID)