A general equilibrium model for industries with price and service competition