Skip to content

J
jiedao-api-boot-master
Commit 25df501c authored by wux's avatar wux
Browse files
Options

bug275：订单编号取值算费存在漏洞，不支持多位国家编码

parent 82d1a216
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 28 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/code/CodeUtils.java
View file @ 25df501c
...@@ -406,11 +406,16 @@ public class CodeUtils { ...@@ -406,11 +406,16 @@ public class CodeUtils {
* * ➢ 海空联运：22年发往莫桑比克的城市Maputo—JMSA2200001M——(国家+运输方式+年份+4位数字+城市) * * ➢ 海空联运：22年发往莫桑比克的城市Maputo—JMSA2200001M——(国家+运输方式+年份+4位数字+城市)
* @return java.lang.String * @return java.lang.String
*/ */
public static String getOddOrderNumbers(String maxOddOrderNumbers, String countryShort, String countryAirShort, String transportShort, String cityShort, public static String getOddOrderNumbers(String maxOddOrderNumbers,
Boolean isExternalWarehouse, Boolean isConcentrateTransport) { String countryShort,
//定义变量(最新的单号) String countryAirShort,
String transportShort,
String cityShort,
Boolean isExternalWarehouse,
Boolean isConcentrateTransport) {
// 定义变量(最新的单号)
String newOddOrderNO = ""; String newOddOrderNO = "";
//获取当前日期并将其进行格式化 // 获取当前日期并将其进行格式化
String formatDate = getDateTime("yy"); String formatDate = getDateTime("yy");
if (isExternalWarehouse == null) { if (isExternalWarehouse == null) {
isExternalWarehouse = false; isExternalWarehouse = false;
...@@ -421,38 +426,91 @@ public class CodeUtils { ...@@ -421,38 +426,91 @@ public class CodeUtils {
if (countryAirShort == null) { if (countryAirShort == null) {
countryAirShort = ""; countryAirShort = "";
} }
//订单前缀（非空运和整柜订单）
StringBuilder orderPrefix = new StringBuilder();
orderPrefix.append(countryShort).append(transportShort).append(formatDate);
// 海运拼柜结尾参数是目的地城市代码，专线空运结尾参数是始发地城市代码 // 海运拼柜结尾参数是目的地城市代码，专线空运结尾参数是始发地城市代码
// TODO 整柜订单编号结尾参数暂时不存在，海空联运的结尾暂时同海运拼柜 // TODO 整柜订单编号结尾参数暂时不存在，海空联运的结尾暂时同海运拼柜
int endIndex = (StringUtils.equals(transportShort, "A") ? 0 : cityShort.length()); int endIndex = (StringUtils.equals(transportShort, "A") ? 0 : cityShort.length());
//判断数据中的最大单号是否存在，是否包含当前日期
// 判断数据中的最大单号是否存在，是否包含当前日期
if (StringUtils.isNotEmpty(maxOddOrderNumbers) && maxOddOrderNumbers.contains(formatDate)) { if (StringUtils.isNotEmpty(maxOddOrderNumbers) && maxOddOrderNumbers.contains(formatDate)) {
//截取后四位数 String endNum;
String endNum = StringUtils.equals(transportShort, "F") ? maxOddOrderNumbers.substring(5) : switch (transportShort) {
(StringUtils.equals(transportShort, "SA") ? maxOddOrderNumbers.substring(isExternalWarehouse && isConcentrateTransport ? 6 : (isExternalWarehouse || isConcentrateTransport ? 5 : 4), maxOddOrderNumbers.length() - endIndex) : case "F":
(StringUtils.equals(transportShort, "A") ? maxOddOrderNumbers.substring(isExternalWarehouse && isConcentrateTransport ? 5 : (isExternalWarehouse || isConcentrateTransport ? 4 : 3), maxOddOrderNumbers.length() - endIndex) : endNum = maxOddOrderNumbers.substring(5);
maxOddOrderNumbers.substring(isExternalWarehouse && isConcentrateTransport ? 6 : (isExternalWarehouse || isConcentrateTransport ? 5 : 4), maxOddOrderNumbers.length() - endIndex))); break;
//把截取的最后四位数解析为int case "A":
long endIntNum = Long.parseLong(endNum); int startIndexA = isExternalWarehouse && isConcentrateTransport ? 5 : (isExternalWarehouse || isConcentrateTransport ? 4 : 3);
//在将其加1(自增1) endNum = maxOddOrderNumbers.substring(startIndexA, maxOddOrderNumbers.length() - endIndex);
long newEndIntNum = (StringUtils.equals(transportShort, "SA") ? 10000 : 100000) + endIntNum + 1; break;
//把10000或100000的1去掉，获取到最新的后5位 default:
int startIndexDefault;
if (isExternalWarehouse && isConcentrateTransport) {
startIndexDefault = 2+orderPrefix.length();
} else if (isExternalWarehouse || isConcentrateTransport) {
startIndexDefault = 1+orderPrefix.length();;
} else {
startIndexDefault = orderPrefix.length();;
}
endNum = maxOddOrderNumbers.substring(startIndexDefault, maxOddOrderNumbers.length() - endIndex);
break;
}
// 检查是否成功截取
if (endNum == null || endNum.isEmpty()) {
throw new IllegalArgumentException("Invalid maxOddOrderNumbers format");
}
// 把截取的最后四位数解析为int
int endIntNum = Integer.parseInt(endNum);
// 在将其加1(自增1)
int base = 100000;
int newEndIntNum = base + endIntNum + 1;
// 把10000或100000的1去掉，获取到最新的后5位
String newEndNum = String.valueOf(newEndIntNum).substring(1); String newEndNum = String.valueOf(newEndIntNum).substring(1);
//生成单号
newOddOrderNO = StringUtils.equals(transportShort, "F") ? "ECF" + formatDate + newEndNum : // 生成单号
(isExternalWarehouse ? "X" : "") + (isConcentrateTransport ? "J" : "") + StringBuilder newOddOrderNOBuilder = new StringBuilder();
(StringUtils.equals(transportShort, "A") ? transportShort + formatDate + newEndNum + countryAirShort : countryShort + transportShort + formatDate + newEndNum + cityShort); if (StringUtils.equals(transportShort, "F")) {
//将单号返回 newOddOrderNOBuilder.append("ECF").append(formatDate).append(newEndNum);
return newOddOrderNO; } else {
if (isExternalWarehouse) {
newOddOrderNOBuilder.append("X");
}
if (isConcentrateTransport) {
newOddOrderNOBuilder.append("J");
}
if (StringUtils.equals(transportShort, "A")) {
newOddOrderNOBuilder.append(transportShort).append(formatDate).append(newEndNum).append(countryAirShort);
} else {
newOddOrderNOBuilder.append(countryShort).append(transportShort).append(formatDate).append(newEndNum).append(cityShort);
}
}
newOddOrderNO = newOddOrderNOBuilder.toString();
} else { } else {
//如果为空(第一次生成)或者当前最大订单号的日期与当前日期不一致说明需要重新计数生成单号 // 如果为空(第一次生成)或者当前最大订单号的日期与当前日期不一致说明需要重新计数生成单号
newOddOrderNO = StringUtils.equals(transportShort, "F") ? "ECF" + formatDate + "00001" : StringBuilder newOddOrderNOBuilder = new StringBuilder();
(isExternalWarehouse ? "X" : "") + (isConcentrateTransport ? "J" : "") + if (StringUtils.equals(transportShort, "F")) {
(StringUtils.equals(transportShort, "A") ? transportShort + formatDate + "00001" + countryAirShort : countryShort + transportShort + formatDate + "00001" + cityShort); newOddOrderNOBuilder.append("ECF").append(formatDate).append("00001");
//将单号返回 } else {
return newOddOrderNO; if (isExternalWarehouse) {
newOddOrderNOBuilder.append("X");
}
if (isConcentrateTransport) {
newOddOrderNOBuilder.append("J");
}
if (StringUtils.equals(transportShort, "A")) {
newOddOrderNOBuilder.append(transportShort).append(formatDate).append("00001").append(countryAirShort);
} else {
newOddOrderNOBuilder.append(countryShort).append(transportShort).append(formatDate).append("00001").append(cityShort);
}
}
newOddOrderNO = newOddOrderNOBuilder.toString();
} }
return newOddOrderNO;
} }
/** /**
* 根据订单编号生成条纹编码 * 根据订单编号生成条纹编码
* *
......
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