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

1

Browse Source
This commit is contained in:
邹宗楠
2025-09-04 10:08:04 +08:00
parent 8f02e5d257
commit ef28818502
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
business/partner/purchase/ebai/order.go
View File

@@ -6,8 +6,6 @@ import (
"strings" "strings"
"time" "time"
beego "github.com/astaxie/beego/server/web"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/baseapi/platformapi/ebaiapi" "git.rosy.net.cn/baseapi/platformapi/ebaiapi"
@@ -401,15 +399,23 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
if isAcceptIt { if isAcceptIt {
if globals.EnableEbaiStoreWrite { if globals.EnableEbaiStoreWrite {
err = api.EbaiAPI.OrderConfirm(order.VendorOrderID) err = api.EbaiAPI.OrderConfirm(order.VendorOrderID)
if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
utils.AfterFuncWithRecover(time.Minute*10, func() { store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, "")
err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID) flag := store.AutoPickup == model.YES && store.VendorStatus == model.StoreStatusOpened // 只要打开了就可以自动拣货
}) if flag {
} else { utils.AfterFuncWithRecover(time.Minute*6, func() {
utils.AfterFuncWithRecover(time.Minute, func() {
err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID) err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
}) })
} }
//if beego.BConfig.RunMode == model.ServerTypeFruits || beego.BConfig.RunMode == model.ServerTypePet {
// utils.AfterFuncWithRecover(time.Minute*10, func() {
// err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
// })
//} else {
// utils.AfterFuncWithRecover(time.Minute, func() {
// err = api.EbaiAPI.OrderPickComplete(order.VendorOrderID)
// })
//}
} }
p.postFakeMsg(order.VendorOrderID, fakeAcceptOrder) p.postFakeMsg(order.VendorOrderID, fakeAcceptOrder)
} else { } else {
@@ -431,9 +437,6 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
if globals.EnableEbaiStoreWrite { if globals.EnableEbaiStoreWrite {
globals.SugarLogger.Debugf("-------PickupGoods := %d , %s ,%s", order.JxStoreID, userName, utils.Format4Output(isSelfDelivery, false))
globals.SugarLogger.Debugf("-------PickupGoods2 := %s", utils.Format4Output(userName == "autoPickup" && !isSelfDelivery, false))
globals.SugarLogger.Debugf("-------PickupGoods3 := %s", order.VendorOrderID)
if userName == "autoPickup" && !isSelfDelivery { if userName == "autoPickup" && !isSelfDelivery {
return nil return nil
} }