fix:高德功能,同步差旅申请单增加入账部门参数

This commit is contained in:
lulz1 2024-05-29 15:40:26 +08:00
parent 05f46be012
commit c62440c4e6
4 changed files with 14 additions and 2 deletions

View File

@ -129,6 +129,14 @@ public class AmapOrderExtensionFactoryImpl implements OrderExtensionFactory {
carOrderDetail.setPhone(data.getMobile()); carOrderDetail.setPhone(data.getMobile());
} }
//补充用车明细如果是取消补充开始时间和结束时间为创建时间
if (carOrderDetail.getStartTime() == null) {
carOrderDetail.setStartTime(carOrderDetail.getCreateTime());
}
if (carOrderDetail.getArriveTime() == null) {
carOrderDetail.setArriveTime(carOrderDetail.getCreateTime());
}
return carOrderDetail; return carOrderDetail;
} }

View File

@ -105,6 +105,8 @@ public class AmapOrderSyncAdapter implements SupplierOrderSync {
+ routeRequestFields.getSysCode() + "-" + routeRequestFields.getSysCode() + "-"
+ routeRequestFields.getActualOrderNo()); + routeRequestFields.getActualOrderNo());
dto.setApplyEUserId(routeRequestFields.getUserId()); dto.setApplyEUserId(routeRequestFields.getUserId());
dto.setDepartmentId(routeRequestFields.getAccountCompanyCode());
dto.setDepartmentName(routeRequestFields.getAccountCompanyName());
User user = userRepository.findByUserEmployeeNo(routeRequestFields.getUserId()); User user = userRepository.findByUserEmployeeNo(routeRequestFields.getUserId());
dto.setApplyMobile(user.getPhoneNumber()); dto.setApplyMobile(user.getPhoneNumber());
dto.setApplyName(user.getName()); dto.setApplyName(user.getName());
@ -147,6 +149,8 @@ public class AmapOrderSyncAdapter implements SupplierOrderSync {
dto.setProcessContent(gson.toJson(processContent)); dto.setProcessContent(gson.toJson(processContent));
dto.setStatus("1"); dto.setStatus("1");
Optional<Supplier> supplier = supplierRepository.findBySupplierName(SUPPLIER_AMAP); Optional<Supplier> supplier = supplierRepository.findBySupplierName(SUPPLIER_AMAP);
supplier.flatMap(Supplier::carSupplierProduct).ifPresent(carSupplierProduct -> { supplier.flatMap(Supplier::carSupplierProduct).ifPresent(carSupplierProduct -> {
if (carSupplierProduct.getSupplierProductStandardLevelList() if (carSupplierProduct.getSupplierProductStandardLevelList()

View File

@ -828,7 +828,7 @@ public class LYTest {
@Test @Test
void searchHotel() { void searchHotel() {
HotelDetailResponse hotelOrderDetail = lySearchRequest.getHotelOrderDetail("HO20240523153100458921"); HotelDetailResponse hotelOrderDetail = lySearchRequest.getHotelOrderDetail("HO20240414144500947464");
Gson gson = new Gson(); Gson gson = new Gson();
String json = gson.toJson(hotelOrderDetail); String json = gson.toJson(hotelOrderDetail);
System.out.println(json); System.out.println(json);

View File

@ -299,7 +299,7 @@ class RouteApplicationTests {
@Test @Test
void loginSign() { void loginSign() {
String sfno = "030710001"; String sfno = "231114011";
String syscode = "FSSC"; String syscode = "FSSC";
String billcode = "CLSQ240225000099"; String billcode = "CLSQ240225000099";
String companycode = "正泰集团股份有限公司"; String companycode = "正泰集团股份有限公司";