diff --git a/src/main/java/com/chint/domain/factoriy/order_detail/AmapOrderExtensionFactoryImpl.java b/src/main/java/com/chint/domain/factoriy/order_detail/AmapOrderExtensionFactoryImpl.java index 4f84082d..d23d0dc4 100644 --- a/src/main/java/com/chint/domain/factoriy/order_detail/AmapOrderExtensionFactoryImpl.java +++ b/src/main/java/com/chint/domain/factoriy/order_detail/AmapOrderExtensionFactoryImpl.java @@ -129,6 +129,14 @@ public class AmapOrderExtensionFactoryImpl implements OrderExtensionFactory { carOrderDetail.setPhone(data.getMobile()); } + //补充用车明细如果是取消,补充开始时间和结束时间为创建时间 + if (carOrderDetail.getStartTime() == null) { + carOrderDetail.setStartTime(carOrderDetail.getCreateTime()); + } + if (carOrderDetail.getArriveTime() == null) { + carOrderDetail.setArriveTime(carOrderDetail.getCreateTime()); + } + return carOrderDetail; } diff --git a/src/main/java/com/chint/domain/service/order_sync/AmapOrderSyncAdapter.java b/src/main/java/com/chint/domain/service/order_sync/AmapOrderSyncAdapter.java index 08f38cdd..ce47bfe3 100644 --- a/src/main/java/com/chint/domain/service/order_sync/AmapOrderSyncAdapter.java +++ b/src/main/java/com/chint/domain/service/order_sync/AmapOrderSyncAdapter.java @@ -105,6 +105,8 @@ public class AmapOrderSyncAdapter implements SupplierOrderSync { + routeRequestFields.getSysCode() + "-" + routeRequestFields.getActualOrderNo()); dto.setApplyEUserId(routeRequestFields.getUserId()); + dto.setDepartmentId(routeRequestFields.getAccountCompanyCode()); + dto.setDepartmentName(routeRequestFields.getAccountCompanyName()); User user = userRepository.findByUserEmployeeNo(routeRequestFields.getUserId()); dto.setApplyMobile(user.getPhoneNumber()); dto.setApplyName(user.getName()); @@ -147,6 +149,8 @@ public class AmapOrderSyncAdapter implements SupplierOrderSync { dto.setProcessContent(gson.toJson(processContent)); dto.setStatus("1"); + + Optional supplier = supplierRepository.findBySupplierName(SUPPLIER_AMAP); supplier.flatMap(Supplier::carSupplierProduct).ifPresent(carSupplierProduct -> { if (carSupplierProduct.getSupplierProductStandardLevelList() diff --git a/src/test/java/com/chint/LYTest.java b/src/test/java/com/chint/LYTest.java index e940b9bf..3a9cb16d 100644 --- a/src/test/java/com/chint/LYTest.java +++ b/src/test/java/com/chint/LYTest.java @@ -828,7 +828,7 @@ public class LYTest { @Test void searchHotel() { - HotelDetailResponse hotelOrderDetail = lySearchRequest.getHotelOrderDetail("HO20240523153100458921"); + HotelDetailResponse hotelOrderDetail = lySearchRequest.getHotelOrderDetail("HO20240414144500947464"); Gson gson = new Gson(); String json = gson.toJson(hotelOrderDetail); System.out.println(json); diff --git a/src/test/java/com/chint/RouteApplicationTests.java b/src/test/java/com/chint/RouteApplicationTests.java index ac8886a0..18600a63 100644 --- a/src/test/java/com/chint/RouteApplicationTests.java +++ b/src/test/java/com/chint/RouteApplicationTests.java @@ -299,7 +299,7 @@ class RouteApplicationTests { @Test void loginSign() { - String sfno = "030710001"; + String sfno = "231114011"; String syscode = "FSSC"; String billcode = "CLSQ240225000099"; String companycode = "正泰集团股份有限公司";