Skip to content

C
cloud-platform
Commit 060b66dc authored by unset's avatar unset
Browse files
Options

会员分成记录信息

parent bafef1ca
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
View file @ 060b66dc
...@@ -273,18 +273,17 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements ...@@ -273,18 +273,17 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
orderPageVo.setUsername(appUserVo.getRealname()); orderPageVo.setUsername(appUserVo.getRealname());
orderPageVo.setPositionName(appUserVo.getPositionName()); orderPageVo.setPositionName(appUserVo.getPositionName());
} }
List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone()); List<Integer> companyIds = userDTO.getCompanyIds();
List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
if (orderPageVo.getOrderRentVehicleDetail() != null) { if (orderPageVo.getOrderRentVehicleDetail() != null) {
if (orderPageVo.getStatus() == 4) { //未交车 if (orderPageVo.getStatus() == 4) { //未交车
if (userDTO.getCompanyId().equals(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId())) { if (companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId())) {
orderPageVo.setUserCompanyStatus(true); orderPageVo.setUserCompanyStatus(true);
} }
getDriverInfo(orderPageVo); getDriverInfo(orderPageVo);
} else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车 } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
if (userDTO.getCompanyId().equals(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) { if (companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
orderPageVo.setUserCompanyStatus(true); orderPageVo.setUserCompanyStatus(true);
} }
//设置违约金金额 //设置违约金金额
......
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