1
This commit is contained in:
@@ -615,13 +615,16 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
|
|||||||
if isSelfDelivery {
|
if isSelfDelivery {
|
||||||
err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
|
err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID))
|
||||||
}
|
}
|
||||||
|
if err != nil && strings.Contains(err.Error(), "商家接单后1分钟内不能确认已完成备货") {
|
||||||
|
partner.CurOrderManager.OnOrderMsg(order, "订单自动拣货失败", err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
if err == nil || strings.Contains(err.Error(), "808") {
|
if err == nil || strings.Contains(err.Error(), "808") {
|
||||||
// 配送类型只能为美团配送或美团企客配送 level:0, code:808
|
// 配送类型只能为美团配送或美团企客配送 level:0, code:808
|
||||||
c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup)
|
c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
partner.CurOrderManager.OnOrderMsg(order, "订单自动拣货失败", err.Error())
|
return nil
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, order *model.GoodsOrder, isAcceptIt bool) (err error) {
|
func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, order *model.GoodsOrder, isAcceptIt bool) (err error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user