Commit 6ecc3b1e authored by 332784038@qq.com's avatar 332784038@qq.com

阶梯价格导出bug修复,区分费用模式来分开处理导出数据

parent 307f3775
......@@ -193,7 +193,7 @@ public class ProductPriceExcelExportListener {
StringBuilder ytqgfSb = new StringBuilder();
StringBuilder ddyfSb = new StringBuilder();
StringBuilder ddqgfSb = new StringBuilder();
if (item.getPriceType() == 0) {
if (CollectionUtil.isNotEmpty(yfStepList)) {
yfStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
for (int j = 1; j <= yfStepList.size(); j++) {
......@@ -232,7 +232,7 @@ public class ProductPriceExcelExportListener {
String unit = "";
if (weightUnit != null) {
UnitDO unitDO = unitMap.get(weightUnit.intValue());
unit = Objects.nonNull(unitDO)?unitDO.getTitleZh():"空";
unit = Objects.nonNull(unitDO) ? unitDO.getTitleZh() : "空";
}
BigDecimal startNum = stepDO.getStartNum();
BigDecimal endNum = stepDO.getEndNum();
......@@ -293,7 +293,8 @@ public class ProductPriceExcelExportListener {
}
}
}
}
if (item.getPriceType() == 1) {
if (CollectionUtil.isNotEmpty(qbjStepList) && item.getPriceType() == 1) {
qbjStepList.sort(Comparator.comparing(ProductPriceStepDO::getRankNum));
for (int j = 1; j <= qbjStepList.size(); j++) {
......@@ -343,7 +344,7 @@ public class ProductPriceExcelExportListener {
}
}
}
}
transportPrice = transportPriceSb.toString();
clearancePrice = clearancePriceSb.toString();
......
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