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

修复同程用车订单无法回推成功的bug

This commit is contained in:
lulz1 2024-03-16 19:37:50 +08:00
parent 5eadbb1d40
commit aa4af85bbc
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chint/application/queryies/OrderQuery.java
View File

@ -506,7 +506,9 @@ public class OrderQuery {
}
public List<RouteOrderPageRes> queryNotSubmit(OrderQueryData queryData) {
User currentUser = BaseContext.getCurrentUser();
List<RouteOrder> routeOrders = routeRepository.findByActualOrderNoNotNull(queryData);
routeOrders = routeOrders.stream().filter(it -> it.getUserId().equals(currentUser.getEmployeeNo())).toList();
routeOrders.forEach(route -> orderDomainService.queryLocation(route.getLegItems()));
Stream<RouteOrder> stream = routeOrders.stream();
if (queryData.getSupplierName() != null) {

3
src/main/java/com/chint/domain/aggregates/order/OrderDetail.java
View File

@ -117,6 +117,9 @@ public class OrderDetail implements Serializable {
}
public OrderEvent getLastEvent() {
if(this.orderEventList == null){
return null;
}
return this.orderEventList.isEmpty() ? null : this.orderEventList.get(this.orderEventList.size() - 1);
// .stream()
// .max(Comparator.comparingLong(OrderEvent::getOrderEventId))

8
src/main/java/com/chint/interfaces/rest/ly/in/CommonController.java
View File

@ -90,16 +90,16 @@ public class CommonController {
int subNotifyType = notification.getSubNotifyType();
if (Objects.nonNull(notifyData)) {
JSONObject jsonObj = JSON.parseObject(notifyData.toString());
ResultBackCar orderCar = jsonObj.toJavaObject(ResultBackCar.class);
String orderSerialNo = orderCar.getData().getOrder().getOrderSerialNo();
String travelApplyNo = orderCar.getData().getTravelData().getTravelApplyNo();
ResultBackCar.DataObject orderCar = jsonObj.toJavaObject(ResultBackCar.DataObject.class);
String orderSerialNo = orderCar.getOrder().getOrderSerialNo();
String travelApplyNo = orderCar.getTravelData().getTravelApplyNo();
OrderTravel orderTravel = new OrderTravel();
orderTravel.setOrderNo(orderSerialNo);
orderTravel.setTravelNo(travelApplyNo);
saveOrderTravel(orderTravel);
lyCallBackDataHandler.trainCallBackData(orderSerialNo, 0);/*
lyCallBackDataHandler.carCallBackData(orderSerialNo, 0);/*
if (subNotifyType == 2 || subNotifyType == 3 || subNotifyType == 1){
sendMsg(travelApplyNo);
}*/