diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 9478debbf..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 { @@ -265,10 +266,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 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) }