1

business/partner/delivery/sfps/waybill.go

@@ -216,6 +216,7 @@ func (d DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
 func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
 	var (
 		weight int
+		flag   = false
 		param  *sfps2.PreCreateOrderReq
 	)
 
@@ -236,12 +237,12 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
 			globals.SugarLogger.Debugf("sfps GetWaybillFee store.CityName==%s,k=%s", store.CityName, k)
 			if strings.Contains(store.CityName, k) || store.CityName == k {
 				param.ShopId = v
-			} else {
-				return nil, errors.New("此城市暂时不在顺丰配送业务范围")
+				flag = true
 			}
 		}
-	} else {
-		return nil, errors.New("门店不允许没有城市名，请检查门店信息")
+	}
+	if flag == false || len(store.CityName) == 0 {
+		return nil, errors.New("此城市暂时不在，顺丰配送业务范围")
 	}
 	param = &sfps2.PreCreateOrderReq{
 		//ShopId:          sfps2.SFShopStoreID,