From 3334466e7040cf4b749b4e2de755755e3b9b350a Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 3 Nov 2018 12:52:14 +0800 Subject: [PATCH] - ErrStoreHaveNoCourier for getMTPSShopID --- business/partner/delivery/mtps/waybill.go | 5 ++++- business/partner/partner.go | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index a284dd55e..4692e30dd 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -296,9 +296,12 @@ func (c *DeliveryHandler) getMTPSShopID(order *model.GoodsOrder, db orm.Ormer) ( if globals.OrderUseNewTable || jxutils.GetJxStoreIDFromOrder(order) == globals.DebugStoreID { db2 := dao.WrapDB(db) storeCourierList, err2 := dao.GetStoreCouriersByStoreID(db2, jxutils.GetJxStoreIDFromOrder(order), model.VendorIDMTPS) - if err = err2; err != nil { + if err = err2; err != nil && err != orm.ErrNoRows { return "", err } + if len(storeCourierList) == 0 { + return "", partner.ErrStoreHaveNoCourier + } retVal = storeCourierList[0].VendorStoreID if beego.BConfig.RunMode == "dev" { retVal = "test_0001" diff --git a/business/partner/partner.go b/business/partner/partner.go index 77c59a3cd..beb08b2a1 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -29,7 +29,8 @@ var ( ) var ( - ErrCanNotFindItem = errors.New("没有找到指定的东西") + ErrCanNotFindItem = errors.New("没有找到指定的东西") + ErrStoreHaveNoCourier = errors.New("门店没有绑定相应的配送信息") ) var (