China wine dispute may be resolved in weeks, Australian trade minister says