Commit e590ffc9 authored by unset's avatar unset

会员分成记录信息

parent 060b66dc
...@@ -351,6 +351,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements ...@@ -351,6 +351,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
// System.out.println(a); // System.out.println(a);
// } // }
/**
* 计算延期费用
* @param orderPageVO
*/
public void updateCrossRefund(OrderPageVO orderPageVO) { public void updateCrossRefund(OrderPageVO orderPageVO) {
//计算延期费用 //计算延期费用
DedDetailDTO dedDetailDTO = new DedDetailDTO(); DedDetailDTO dedDetailDTO = new DedDetailDTO();
......
...@@ -110,15 +110,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp ...@@ -110,15 +110,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
} }
List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto); List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
for (OrderVehicleCrosstownDto value : list) { for (OrderVehicleCrosstownDto value : list) {
if (value != null && value.getOrperaterId() != null && value.getType() != 1) { // if (value != null && value.getOrperaterId() != null && value.getType() != 1) {
UserDTO userDTO = userFeign.userinfoByUid(value.getOrperaterId()).getData(); // UserDTO userDTO = userFeign.userinfoByUid(value.getOrperaterId()).getData();
if (userDTO != null) { // if (userDTO != null) {
CompanyDetail branchCompany = vehicleFeign.getCompanyDetail(userDTO.getCompanyId()).getData(); // CompanyDetail branchCompany = vehicleFeign.getCompanyDetail(userDTO.getCompanyId()).getData();
if (branchCompany != null) { // if (branchCompany != null) {
value.setCustomerPhone(branchCompany.getVehiceServicePhone()); // value.setCustomerPhone(branchCompany.getVehiceServicePhone());
} // }
} // }
} // }
if (value.getType() == 2 || value.getType() == 3) { if (value.getType() == 2 || value.getType() == 3) {
List<Coupon> c = baseOrderBiz.getReturnCouponByOrderId(value.getOrderId()); List<Coupon> c = baseOrderBiz.getReturnCouponByOrderId(value.getOrderId());
......
...@@ -49,6 +49,7 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz, Orde ...@@ -49,6 +49,7 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz, Orde
OrderTourReceivedStatisticsBiz orderTourReceivedStatisticsBiz; OrderTourReceivedStatisticsBiz orderTourReceivedStatisticsBiz;
@Autowired @Autowired
TourFeign tourFeign; TourFeign tourFeign;
@Autowired @Autowired
......
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