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

修复已变更无法同步问题

This commit is contained in:
lulz1 2024-03-13 15:48:31 +08:00
parent 799f9a2074
commit 233d548915
2 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/chint/domain/service/LegDomainService.java
View File

@ -40,7 +40,7 @@ public class LegDomainService {
leg.reloadStatus();
if (!orderDetailList.isEmpty()) {
String lastOrderStatus = orderDetailList.get(orderDetailList.size() - 1).getOrderStatus();
//如果是未同步状态 ， 就不进行订单检查
//如果是未同步状态 ，就不进行订单检查
if (leg.getLegStatus().equals(LEG_STATUS_APPROVAL)) {
return leg;
}
@ -53,6 +53,7 @@ public class LegDomainService {
}
}
if (lastOrderStatus.equals(ORDER_EVENT_CANCEL_NAME)) {
LegEvent legEvent = legEventFactory.creatLegEvent(LEG_EVENT_CANCEL);
leg.addEvent(legEvent);
@ -67,6 +68,13 @@ public class LegDomainService {
leg.addEvent(legEvent);
return legRepository.save(leg);
}
if(leg.getLegStatus().equals(LEG_STATUS_CHANGE)){
//如果发现该订单
LegEvent legEvent = legEventFactory.creatLegEvent(LEG_EVENT_APPROVAL);
leg.addEvent(legEvent);
return legRepository.save(leg);
}
return leg;
}

36
src/main/java/com/chint/interfaces/rest/ctrip/dto/search/car/BasicInfo.java
View File

@ -16,41 +16,5 @@ public class BasicInfo {
private String FeeType; // 费用类型
private String UID; // 用户ID
private String CreateTime;
private String PreEmployeeName;
private String PreEmployeeID;
private String PolicyId;
private String CorpId;
private String CorpName;
private int AccountId;
private int SubAccountId;
private String ContactName;
private String IntlCode;
private String ContactMobile;
private String ContactEmail;
private boolean NeedInvoice;
private int ExtraOrders;
private String CostCenter1;
private String CostCenter2;
private String CostCenter3;
private String CostCenter4;
private String CostCenter5;
private String CostCenter6;
private String JourneyReason;
private String Project;
private String JouneryID;
private String JourneyID; // Note: "JouneryID" and "JourneyID" seem redundant, consider keeping one.
private String DefineValue1;
private String DefineValue2;
private String ServerFrom;
private Boolean IsOfficialCard; // Using Boolean to allow null value
private double AccntAmount;
private double PersonAmount;
private double WaitPayAmount;
private String PlatformOrderId;
private double DockingVendorPlatform;
private String DockingVendorPlatformAccount;
private String CorpDockingInfoList; // Assuming string representation, adjust based on actual structure
private String PreEmployeeNamePinYin;
private String SubProductLine;
// Other fields and getters/setters
}