Commit a13a3e5b authored by jiaorz's avatar jiaorz

修改租車訂單地址,修改车辆预定时添加订单号

parent 914595f4
...@@ -330,6 +330,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp ...@@ -330,6 +330,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
newValue.setCrosstownId(orderVehicleCrosstown.getId()); newValue.setCrosstownId(orderVehicleCrosstown.getId());
newValue.setId(null); newValue.setId(null);
orderDepositRefundRecordBiz.save(newValue); orderDepositRefundRecordBiz.save(newValue);
DepositRefundRecord nextValue = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUNDARRIVAL.getCode());
if(nextValue != null) {
nextValue.setRestAmount(newValue.getRestAmount());
orderDepositRefundRecordBiz.update(nextValue);
}
} else { } else {
throw new BaseException("定损记录不存在!请联系客服"); throw new BaseException("定损记录不存在!请联系客服");
} }
......
...@@ -72,14 +72,14 @@ public class OrderRentVehicleController extends CommonBaseController { ...@@ -72,14 +72,14 @@ public class OrderRentVehicleController extends CommonBaseController {
}else { }else {
BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0); BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
vo.setEndCompanyId(endCompany.getId()); vo.setEndCompanyId(endCompany.getId());
vo.setEndAddr(endCompany.getAddrDetail()); vo.setEndAddr(endCompany.detailAddr());
} }
} }
} }
if(vo.getStartCompanyId() != null) { if(vo.getStartCompanyId() != null) {
CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData(); CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData();
if(companyDetail != null) { if(companyDetail != null) {
vo.setStartAddr(companyDetail.getAddrDetail()); vo.setStartAddr(companyDetail.detailAddr());
} }
} }
RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class); RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment