liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into yonghui

Browse Source
This commit is contained in:
苏尹岚
2019-12-10 15:51:57 +08:00
parent cca21bda95 f4bd2fc1cc
commit 4412af185c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -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) { 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 order.VendorID == model.VendorIDJD {
if selfTakeCode == autoSelfTakeCode { if selfTakeCode == autoSelfTakeCode {
if selfTakeCode, err = jd.CurPurchaseHandler.GetSelfTakeCode(ctx, order); err != nil { 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()) err = handler.AcceptOrRefuseOrder(order, true, ctx.GetUserName())
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
} }
if err == nil { }
if err = c.confirmSelfTake(ctx, order, autoSelfTakeCode); err == nil { if err == nil {
retVal = []int{1} if err = c.confirmSelfTake(ctx, order, autoSelfTakeCode); err == nil {
} retVal = []int{1}
} }
} }
return retVal, err return retVal, err

5
business/partner/purchase/ebai/act_page.go
View File

@@ -84,8 +84,9 @@ func (c *PurchaseHandler) GetPageActList(ctx *jxcontext.Context, createdFrom tim
VendorMask: model.GetVendorMask(model.VendorIDEBAI), VendorMask: model.GetVendorMask(model.VendorIDEBAI),
LimitCount: 1, LimitCount: 1,
}, },
VendorID: model.VendorIDEBAI, VendorID: model.VendorIDEBAI,
VendorActID: ebaiAct.ActivityID, VendorOrgCode: api.EbaiAPI.GetSource(),
VendorActID: ebaiAct.ActivityID,
} }
actList = append(actList, act) actList = append(actList, act)
} }