From 6616e57a5c0c42c8464758af653e51b9af88a535 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 10 Jan 2020 10:25:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E9=87=8D=E5=8F=A0=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 70a24c64c..bcb35cbec 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -167,7 +167,7 @@ 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) From 208f89f9cf939b3fe16ac88c6d8d8b5de87f51f2 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 10 Jan 2020 12:22:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A5=BF=E7=99=BE=E6=96=B0=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E4=BA=8B=E4=BB=B6=E8=A6=81=E6=9F=A5=E8=AF=A2=E5=BF=AB?= =?UTF-8?q?=E9=80=92=E5=91=98=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=BA=8B=E4=BB=B6=E9=94=99=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/waybill.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)