|
|
|
@@ -183,6 +183,16 @@ func updatePricing() { |
|
|
|
sort.Slice(vendorsList, func(i, j int) bool { |
|
|
|
oi := vendorOrderMap[vendorsList[i].ID] |
|
|
|
oj := vendorOrderMap[vendorsList[j].ID] |
|
|
|
// 0 排到最后 |
|
|
|
if oi == 0 && oj == 0 { |
|
|
|
return vendorsList[i].ID < vendorsList[j].ID |
|
|
|
} |
|
|
|
if oi == 0 { |
|
|
|
return false |
|
|
|
} |
|
|
|
if oj == 0 { |
|
|
|
return true |
|
|
|
} |
|
|
|
if oi != oj { |
|
|
|
return oi < oj |
|
|
|
} |
|
|
|
@@ -336,13 +346,23 @@ func updatePricing() { |
|
|
|
pricingMap = append(pricingMap, pricing) |
|
|
|
} |
|
|
|
|
|
|
|
// 按 sort_order 排序 pricingMap |
|
|
|
// 按 sort_order 排序 pricingMap,0 排到最后 |
|
|
|
sort.Slice(pricingMap, func(i, j int) bool { |
|
|
|
mi, okI := metaMap[pricingMap[i].ModelName] |
|
|
|
mj, okJ := metaMap[pricingMap[j].ModelName] |
|
|
|
if okI && okJ { |
|
|
|
if mi.SortOrder != mj.SortOrder { |
|
|
|
return mi.SortOrder < mj.SortOrder |
|
|
|
si, sj := mi.SortOrder, mj.SortOrder |
|
|
|
if si == 0 && sj == 0 { |
|
|
|
return pricingMap[i].ModelName < pricingMap[j].ModelName |
|
|
|
} |
|
|
|
if si == 0 { |
|
|
|
return false |
|
|
|
} |
|
|
|
if sj == 0 { |
|
|
|
return true |
|
|
|
} |
|
|
|
if si != sj { |
|
|
|
return si < sj |
|
|
|
} |
|
|
|
} else if okI { |
|
|
|
return true |
|
|
|
|