echo
/
route
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修复结算明细接口的bug

This commit is contained in:
lulz1 2024-04-19 21:23:41 +08:00
parent b52ce596aa
commit c840f523ed
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/chint/application/queryies/OrderDetailQuery.java
View File

@ -169,7 +169,8 @@ public class OrderDetailQuery {
!hotelOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) && !hotelOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) &&
systemType.equals(hotelOrderDetail.getBelongSysType())) { systemType.equals(hotelOrderDetail.getBelongSysType())) {
if (hotelOrderDetail.getCreateTime().contains("1900") || hotelOrderDetail.getCreateTime().contains("2999")) { String createTime = hotelOrderDetail.getCreateTime();
if (createTime != null && (createTime.contains("1900") || createTime.contains("2999"))) {
return null; return null;
} }
@ -199,7 +200,8 @@ public class OrderDetailQuery {
!trainOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) && !trainOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) &&
systemType.equals(trainOrderDetail.getBelongSysType())) { systemType.equals(trainOrderDetail.getBelongSysType())) {
if (trainOrderDetail.getCreateTime().contains("1900") || trainOrderDetail.getCreateTime().contains("2999")) { String createTime = trainOrderDetail.getCreateTime();
if (createTime != null && (createTime.contains("1900") || createTime.contains("2999"))) {
return null; return null;
} }
@ -222,16 +224,17 @@ public class OrderDetailQuery {
!carOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) && !carOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) &&
systemType.equals(carOrderDetail.getBelongSysType())) { systemType.equals(carOrderDetail.getBelongSysType())) {
if (carOrderDetail.getCreateTime().contains("1900") || carOrderDetail.getCreateTime().contains("2999")) { String createTime = carOrderDetail.getCreateTime();
if (createTime != null && (createTime.contains("1900") || createTime.contains("2999"))) {
return null; return null;
} }
if (carOrderDetail.getStartTime() != null && carOrderDetail.getStartTime().contains("1900")) { if (carOrderDetail.getStartTime() != null && carOrderDetail.getStartTime().contains("1900")) {
carOrderDetail.setStartTime(carOrderDetail.getCreateTime()); carOrderDetail.setStartTime(createTime);
} }
if (carOrderDetail.getArriveTime() != null && carOrderDetail.getArriveTime().contains("1900")) { if (carOrderDetail.getArriveTime() != null && carOrderDetail.getArriveTime().contains("1900")) {
carOrderDetail.setArriveTime(carOrderDetail.getCreateTime()); carOrderDetail.setArriveTime(createTime);
} }
String receiptsNum = carOrderDetail.getReceiptsNum(); String receiptsNum = carOrderDetail.getReceiptsNum();
@ -260,7 +263,8 @@ public class OrderDetailQuery {
!flightOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) && !flightOrderDetail.getOrderStatus().equals(FSSC_ORDER_STATUS_CANCEL) &&
systemType.equals(flightOrderDetail.getBelongSysType())) { systemType.equals(flightOrderDetail.getBelongSysType())) {
if (flightOrderDetail.getCreateTime().contains("1900") || flightOrderDetail.getCreateTime().contains("2999")) { String createTime = flightOrderDetail.getCreateTime();
if (createTime != null && (createTime.contains("1900") || createTime.contains("2999"))) {
return null; return null;
} }
@ -310,4 +314,5 @@ public class OrderDetailQuery {
List<OrderDetailRes> OrderDetailResList = res.stream().sorted(Comparator.comparing(OrderDetail::getUpdateTime).reversed()).skip((long) (pageNum - 1) * pageSize).limit(pageSize).map(OrderDetailMapper::copyFromExtension).toList(); List<OrderDetailRes> OrderDetailResList = res.stream().sorted(Comparator.comparing(OrderDetail::getUpdateTime).reversed()).skip((long) (pageNum - 1) * pageSize).limit(pageSize).map(OrderDetailMapper::copyFromExtension).toList();
return new PageResult<>(total, OrderDetailResList); return new PageResult<>(total, OrderDetailResList);
} }
} }

5
src/main/java/com/chint/application/queryies/util/QueryUtil.java
View File

@ -3,11 +3,14 @@ package com.chint.application.queryies.util;
public class QueryUtil { public class QueryUtil {
public static String reGetReceiptsNum(String receiptsNum) { public static String reGetReceiptsNum(String receiptsNum) {
if (receiptsNum == null || receiptsNum.isEmpty()) {
return null;
}
if (receiptsNum.contains("-")) { if (receiptsNum.contains("-")) {
String[] split = receiptsNum.split("-"); String[] split = receiptsNum.split("-");
receiptsNum = split[1]; receiptsNum = split[1];
} }
if(receiptsNum.contains("#")){ if (receiptsNum.contains("#")) {
String[] split1 = receiptsNum.split("#"); String[] split1 = receiptsNum.split("#");
receiptsNum = split1[0]; receiptsNum = split1[0];
} }

2
src/main/java/com/chint/interfaces/rest/ctrip/in/CTripNoteController.java
View File

@ -164,7 +164,7 @@ public class CTripNoteController {
} }
if (etaReason == null) { if (etaReason == null) {
String agreementRCInfo = hotelOrderInfoEntity.getAgreementRCInfo(); String agreementRCInfo = hotelOrderInfoEntity.getAgreementRCInfo();
if(agreementRCInfo.startsWith("其他")){ if(agreementRCInfo != null && agreementRCInfo.startsWith("其他")){
etaReason = hotelOrderInfoEntity.getLowPriceRC_W(); etaReason = hotelOrderInfoEntity.getLowPriceRC_W();
} else { } else {
etaReason = agreementRCInfo; etaReason = agreementRCInfo;