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:
邹宗楠
2023-09-12 17:51:20 +08:00
parent c667c39a8a
commit 22e90e0f09
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
business/partner/purchase/tao_vegetable/order.go
View File

@@ -498,24 +498,25 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
// PickupGoods 拣货 // PickupGoods 拣货
func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
var err2 error
if isSelfDelivery { if isSelfDelivery {
param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp) param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusPickedUp)
if err != nil { if err != nil {
return err return err
} }
api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "") api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "")
err = api.DeliveryFinish(param) for i := 0; i < 3; i++ {
if err != nil && strings.Contains(err.Error(), "并发操作，执行失败，请重试") { err2 := api.DeliveryFinish(param)
time.Sleep(200 * time.Millisecond) if err2 != nil {
err2 = api.DeliveryFinish(param) time.Sleep(200 * time.Millisecond)
} else if err != nil { err = err2
return err continue
}
if err2 == nil {
c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
break
}
} }
if err == nil && err2 == nil {
c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
}
} }
return err return err
} }