1

business/partner/purchase/tao_vegetable/order.go

@@ -502,9 +502,16 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
 		if err != nil {
 			return err
 		}
-		if err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").DeliveryFinish(param); err != nil {
+		api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "")
+		err = api.DeliveryFinish(param)
+
+		if err != nil && strings.Contains(err.Error(), "并发操作，执行失败，请重试") {
+			time.Sleep(200 * time.Millisecond)
+			api.DeliveryFinish(param)
+		} else if err != nil {
 			return err
 		}
+
 		c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp)
 	}
 	return err