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:
邹宗楠
2024-04-12 17:02:05 +08:00
parent f5cb623598
commit 676a9c3dbf
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/partner/purchase/mtwm/order.go
View File

@@ -542,8 +542,7 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
} }
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) {
api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "") orderDetail, err := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderGetOrderDetail(utils.Str2Int64(order.VendorOrderID), false)
orderDetail, err := api.OrderGetOrderDetail(utils.Str2Int64(order.VendorOrderID), false)
if err != nil { if err != nil {
return err return err
} }
@@ -569,7 +568,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
//PeiSongTypeMixed = "3001" // 混合送（即美团专送+快送） //PeiSongTypeMixed = "3001" // 混合送（即美团专送+快送）
//PeiSongTypeMixedExpressQiKe // 混合快送 //PeiSongTypeMixedExpressQiKe // 混合快送
if isSelfDelivery { if isSelfDelivery {
err = api.PreparationMealComplete(utils.Str2Int64(order.VendorOrderID)) err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
} }
if err == nil || strings.Contains(err.Error(), "808") { if err == nil || strings.Contains(err.Error(), "808") {
// 配送类型只能为美团配送或美团企客配送 level:0, code:808 // 配送类型只能为美团配送或美团企客配送 level:0, code:808