Skip to content
Snippets Groups Projects
Commit eb864d18 authored by zhuxiang's avatar zhuxiang
Browse files

Merge branch 'feature/zhuxiang' into 'develop'

座位增加南航 A=经济舱

See merge request !250
parents e9be4582 497d505c
Branches
1 merge request!250座位增加南航 A=经济舱
Pipeline #150914 failed with stage
......@@ -2361,25 +2361,38 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService {
if ("收据".equals(fjTitle0)) {
invoiceName = "未知";
} else {
int invoiceNameLength = 0;
for (InvoiceSettingAggregate fjAgg : loopList) {
//todo 先比较fpTitle
if (!StringUtils.isEmpty(fpTitle) && (fpTitle.contains(fjAgg.getInvoiceName()) || ClaimAuditUtil.getBillType(configAgg.getBillTypeMap(), fpTitle).contains(fjAgg.getInvoiceName()))) {
invoiceName = fjAgg.getInvoiceName();
break;
if (fjAgg.getInvoiceName().length() > invoiceNameLength) {
invoiceNameLength = fjAgg.getInvoiceName().length();
invoiceName = fjAgg.getInvoiceName();
usefjTitle = false;
fjTitleFinal = "";
if (invoiceNameLength > 2) {
break;
}
}
}
//todo 再比较fjTitle
if (!StringUtils.isEmpty(fjTitle) && fjTitle.contains(fjAgg.getInvoiceName())) {
invoiceName = fjAgg.getInvoiceName();
usefjTitle = true;
fjTitleFinal = stringBuilder.toString();
if (!ObjectUtil.isEmpty(fjTitleFinal)) {
if (ObjectUtil.isEmpty(fjTitle0)) {
fjTitleFinal = fjTitleFinal.substring(0, fjTitleFinal.length() - 1);
} else {
fjTitleFinal = fjTitle0;
if (fjAgg.getInvoiceName().length() > invoiceNameLength) {
invoiceNameLength = fjAgg.getInvoiceName().length();
invoiceName = fjAgg.getInvoiceName();
usefjTitle = true;
fjTitleFinal = stringBuilder.toString();
if (!ObjectUtil.isEmpty(fjTitleFinal)) {
if (ObjectUtil.isEmpty(fjTitle0)) {
fjTitleFinal = fjTitleFinal.substring(0, fjTitleFinal.length() - 1);
} else {
fjTitleFinal = fjTitle0;
}
}
if (invoiceNameLength > 2) {
break;
}
}
break;
}
}
}
......
......@@ -131,6 +131,21 @@ public class ClaimAuditTempServiceImpl implements ClaimAuditTempService {
}
}
map.put("main", mainOutList);
JSONArray detailsArr = JSON.parseArray(JSON.toJSONString(map.get("detailList")));
List<List<ClaimAuditOcrOut>> detailsOutList = new ArrayList<>();
for (int i = 0; i < detailsArr.size(); i++) {
List<ClaimAuditOcrOut> detailOutList = new ArrayList<>();
JSONArray detailArr = detailsArr.getJSONArray(i);
for (Object o : detailArr) {
ClaimAuditOcrOut detailOut = JSON.parseObject(JSON.toJSONString(o), ClaimAuditOcrOut.class);
if (!detailOut.getKey().startsWith("$")) {
detailOutList.add(detailOut);
}
}
detailsOutList.add(detailOutList);
}
map.put("detailList", detailsOutList);
}
// 全电票分页的特殊处理
......
......@@ -279,6 +279,7 @@ public class ClaimAuditUtil {
}
String trainNumber = null;
String seatPlace = null;
String carrier = null;
for (ClaimAuditOcrOut out : outs) {
if (out.getKey().equals("trainNumber")) {
trainNumber = out.getValue();
......@@ -286,9 +287,12 @@ public class ClaimAuditUtil {
if (out.getKey().equals("seatPlace")) {
seatPlace = out.getValue();
}
if (out.getKey().equals("$carrier")) {
carrier = out.getValue();
}
}
if (!StringUtils.isEmpty(trainNumber) && !StringUtils.isEmpty(seatPlace)) {
String seatBySeatPlace = getSeatBySeatPlace(billType, seatPlace, trainNumber);
String seatBySeatPlace = getSeatBySeatPlace(billType, seatPlace, trainNumber, carrier);
for (ClaimAuditOcrOut out : outs) {
if (out.getKey().equals("seatPlace")) {
out.setValue(seatBySeatPlace);
......@@ -348,7 +352,7 @@ public class ClaimAuditUtil {
}
}
private static String getSeatBySeatPlace(String billType, String seatPlace, String trainNumber) {
private static String getSeatBySeatPlace(String billType, String seatPlace, String trainNumber, String carrier) {
if (billType.equals("火车票")) {
if (seatPlace.contains("软座")) {
return "火车软座";
......@@ -397,12 +401,22 @@ public class ClaimAuditUtil {
}
return seatPlace;
} else if (billType.equals("航空运输电子客票行程单")) {
if (Arrays.asList("F", "A").contains(seatPlace)) {
return "飞机头等舱";
} else if (Arrays.asList("C", "D", "J").contains(seatPlace)) {
return "飞机公务舱";
if ("CZ".equalsIgnoreCase(carrier) || "南航".equalsIgnoreCase(carrier)) {
if (Arrays.asList("F").contains(seatPlace)) {
return "飞机头等舱";
} else if (Arrays.asList("C", "D", "J", "I").contains(seatPlace)) {
return "飞机公务舱";
} else {
return "飞机经济舱";
}
} else {
return "飞机经济舱";
if (Arrays.asList("F", "A").contains(seatPlace)) {
return "飞机头等舱";
} else if (Arrays.asList("C", "D", "J").contains(seatPlace)) {
return "飞机公务舱";
} else {
return "飞机经济舱";
}
}
} else {
return seatPlace;
......
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