Remade the payment fee calculation process