Commit 3fc840d0 authored by zp's avatar zp

Merge remote-tracking branch 'origin/v2.0.0' into dev

parents 584588f4 d91de211
......@@ -1889,7 +1889,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "day":
sort = "ret_1day ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......@@ -1897,7 +1897,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "week":
sort = "ret_1w ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......@@ -1905,7 +1905,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "month":
sort = "ret_1m ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......@@ -1913,7 +1913,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "season":
sort = "ret_3m ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......@@ -1921,7 +1921,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "halfAYear":
sort = "ret_6m ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......@@ -1929,7 +1929,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "year":
sort = "ret_1y ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......@@ -1937,7 +1937,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "twoYear":
sort = "ret_2y ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......@@ -1945,7 +1945,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "threeYear":
sort = "ret_3y ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......@@ -1953,7 +1953,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "fiveYear":
sort = "ret_5y ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......@@ -1961,7 +1961,7 @@ public class ProductServiceImpl implements ProductService, Constant {
case "retIncep":
sort = "ret_incep ";
if (StringUtils.isNotEmpty(req.getRankSort())) {
sort = sort + req.getNetSort() + ",";
sort = sort + req.getRankSort() + ", ";
} else {
sort = sort + "desc,";
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment