1

business/partner/delivery/sfps/waybill.go

@@ -141,8 +141,8 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
 		}
 	}
 	if flag == false || len(store.CityName) == 0 {
-		flag = true //todo 测试用
-		//return nil, errors.New("此城市暂时不在，顺丰配送业务范围")
+		//flag = true //todo 测试用
+		return nil, errors.New("此城市暂时不在，顺丰配送业务范围")
 	}
 	if len(order.Skus) != model.NO {
 		for _, v := range order.Skus {
@@ -272,8 +272,8 @@ func (d DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo
 		}
 	}
 	if flag == false || len(store.CityName) == 0 {
-		flag = true
-		//return nil, errors.New("此城市暂时不在，顺丰配送业务范围")
+		//flag = true
+		return nil, errors.New("此城市暂时不在，顺丰配送业务范围")
 	}
 	deliveryFeeInfo = &partner.WaybillFeeInfo{}
 	price, err := api.SfPsAPI.PreCreateOrder(param)