|
|
@ -398,6 +398,11 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper, |
|
|
|
if (!userVoResultBean.getSuccess()) { |
|
|
|
return rb.setMsg(userVoResultBean.getMsg()); |
|
|
|
} |
|
|
|
//pc发起人
|
|
|
|
appDeliveredDetailsVo.setPcApplyName(busDeliveredApply.getApplyName()); |
|
|
|
appDeliveredDetailsVo.setPcApplySid(busDeliveredApply.getApplySid()); |
|
|
|
appDeliveredDetailsVo.setPcApplyDept(busDeliveredApply.getApplyDept()); |
|
|
|
appDeliveredDetailsVo.setPcApplyDeptSid(busDeliveredApply.getApplyDeptSid()); |
|
|
|
appDeliveredDetailsVo.setPcStaffSid(userVoResultBean.getData().getStaffSid()); |
|
|
|
appDeliveredDetailsVo.setUserSid(busDeliveredApply.getApplySid()); |
|
|
|
appDeliveredDetailsVo.setOrgPath(busDeliveredApply.getOrgSidPath()); |
|
|
@ -407,9 +412,16 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper, |
|
|
|
appDeliveredDetailsVo.setCreateTime(DateUtil.format(busDeliveredApply.getCreateTime(), "yyyy-MM-dd")); |
|
|
|
if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPrice())) { |
|
|
|
appDeliveredDetailsVo.setDistributorName(busDeliveredApply.getDistributorName() + ",单车中介费:" + busDeliveredApply.getDistributorPrice() + "元"); |
|
|
|
appDeliveredDetailsVo.setPcDistributorName(busDeliveredApply.getDistributorName()); |
|
|
|
appDeliveredDetailsVo.setPcDistributorPrice(busDeliveredApply.getDistributorPrice()); |
|
|
|
appDeliveredDetailsVo.setPcDistributorPriceAll(new BigDecimal(busDeliveredApply.getDistributorPrice()).multiply(new BigDecimal(query.getList().size())).toString()); |
|
|
|
|
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(busDeliveredApply.getDistributorPriceTwo())) { |
|
|
|
appDeliveredDetailsVo.setDistributorNameTwo(busDeliveredApply.getDistributorNameTwo() + ",单车中介费:" + busDeliveredApply.getDistributorPriceTwo() + "元"); |
|
|
|
appDeliveredDetailsVo.setDistributorNameTwo(busDeliveredApply.getDistributorNameTwo()); |
|
|
|
appDeliveredDetailsVo.setPcDistributorPriceTwo(busDeliveredApply.getDistributorPriceTwo()); |
|
|
|
appDeliveredDetailsVo.setPcDistributorPriceTwoAll(new BigDecimal(busDeliveredApply.getDistributorPriceTwo()).multiply(new BigDecimal(query.getList().size())).toString()); |
|
|
|
} |
|
|
|
List<AppCarListVo> carList = new ArrayList<>(); |
|
|
|
List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid()); |
|
|
|