From d2168afd159fa064ecad7fbaa38902341c78b197 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 10 Dec 2019 14:48:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DConfirmSelfTakeOrders?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/basesch/basesch_ext.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 9478debbf..c80b341b9 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -265,10 +265,10 @@ func (c *BaseScheduler) ConfirmSelfTakeOrders(ctx *jxcontext.Context, vendorIDs err = handler.AcceptOrRefuseOrder(order, true, ctx.GetUserName()) time.Sleep(2 * time.Second) } - if err == nil { - if err = c.confirmSelfTake(ctx, order, autoSelfTakeCode); err == nil { - retVal = []int{1} - } + } + if err == nil { + if err = c.confirmSelfTake(ctx, order, autoSelfTakeCode); err == nil { + retVal = []int{1} } } return retVal, err From 9cf63d1e80046bac243dd8223ea6818b5f626100 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 10 Dec 2019 14:58:40 +0800 Subject: [PATCH 2/3] fk --- business/jxcallback/scheduler/basesch/basesch_ext.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index c80b341b9..31d20b865 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -237,6 +237,7 @@ func (c *BaseScheduler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID st } func (c *BaseScheduler) confirmSelfTake(ctx *jxcontext.Context, order *model.GoodsOrder, selfTakeCode string) (err error) { + globals.SugarLogger.Debugf("confirmSelfTake orderID:%s, selfTakeCode:%s", order.VendorOrderID, selfTakeCode) if order.VendorID == model.VendorIDJD { if selfTakeCode == autoSelfTakeCode { if selfTakeCode, err = jd.CurPurchaseHandler.GetSelfTakeCode(ctx, order); err != nil { From f4bd2fc1ccb12e983c698a1ce5d94ca7445e4dd5 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 10 Dec 2019 15:07:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A5=BF=E7=99=BE=E7=BD=91=E9=A1=B5?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=AD=A3=E7=A1=AE=E8=AE=BE=E7=BD=AEVendorOrg?= =?UTF-8?q?Code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/act_page.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/ebai/act_page.go b/business/partner/purchase/ebai/act_page.go index c0fe778d2..4327faf40 100644 --- a/business/partner/purchase/ebai/act_page.go +++ b/business/partner/purchase/ebai/act_page.go @@ -84,8 +84,9 @@ func (c *PurchaseHandler) GetPageActList(ctx *jxcontext.Context, createdFrom tim VendorMask: model.GetVendorMask(model.VendorIDEBAI), LimitCount: 1, }, - VendorID: model.VendorIDEBAI, - VendorActID: ebaiAct.ActivityID, + VendorID: model.VendorIDEBAI, + VendorOrgCode: api.EbaiAPI.GetSource(), + VendorActID: ebaiAct.ActivityID, } actList = append(actList, act) }