| | |
| | | // 通过uid 和时间查出来数据 先判断是否传入了分页 |
| | | if (query.getPageNo()!=null && query.getPageSize()!=null) { |
| | | Page<XpOrder> page = new Page<>(query.getPageNo(), query.getPageSize()); |
| | | Page<XpOrder> orderPage = this.baseMapper.selectPage(page, new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getAppUserId, Long.valueOf(query.getUid())).ge(XpOrder::getStatus, 9).between(BaseModel::getCreateTime, startTime, endTime)); |
| | | Page<XpOrder> orderPage = this.baseMapper.selectPage(page, new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getAppUserId, Long.valueOf(query.getUid())).ge(XpOrder::getStatus, 9).between(BaseModel::getCreateTime, startTime, endTime).orderByDesc(BaseModel::getCreateTime)); |
| | | list = orderPage.getRecords(); |
| | | }else { |
| | | list = this.baseMapper.selectList(new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getAppUserId, Long.valueOf(query.getUid())).ge(XpOrder::getStatus, 9).between(BaseModel::getCreateTime, startTime, endTime)); |
| | | list = this.baseMapper.selectList(new LambdaQueryWrapper<XpOrder>().eq(XpOrder::getAppUserId, Long.valueOf(query.getUid())).ge(XpOrder::getStatus, 9).between(BaseModel::getCreateTime, startTime, endTime).orderByDesc(BaseModel::getCreateTime)); |
| | | } |
| | | |
| | | if(list.isEmpty()){ |
| | |
| | | xpInvoiceVo.setOrderNo(xpOrder.getOrderNumber()); |
| | | xpInvoiceVo.setOrderTotalAmount(xpOrder.getOrderMoney()); |
| | | xpInvoiceVo.setOrderDiscountAmount(xpOrder.getCouponMoney()); |
| | | xpInvoiceVo.setOrderFinishTime(String.valueOf(xpOrder.getTripEnd())); |
| | | xpInvoiceVo.setOrderFinishTime(xpOrder.getTripEnd()!=null?String.valueOf(xpOrder.getTripEnd()):""); |
| | | xpInvoiceVo.setXpInvoiceFlag(true); |
| | | xpInvoiceVo.setInvoiceStatus(xpOrder.getInvoiceStatus()); |
| | | XpInvoiceVo.Itinerary itinerary = new XpInvoiceVo.Itinerary(); |
| | | // yyyy-MM-dd格式 |
| | | itinerary.setTripStartDate(xpOrder.getAcceptanceTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); |
| | | itinerary.setTripEndDate(xpOrder.getTripEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); |
| | | itinerary.setTripStartDate(xpOrder.getAcceptanceTime()!=null?xpOrder.getAcceptanceTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")):""); |
| | | itinerary.setTripEndDate(xpOrder.getTripEnd()!=null?xpOrder.getTripEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")):""); |
| | | |
| | | |
| | | XpVehicle xpVehicle = vehicleList.stream().filter(vehicle -> vehicle.getId().equals(xpOrder.getVehicleId())).findFirst().get(); |
| | | itinerary.setCarType(xpVehicle.getVehicleModel()); |
| | | itinerary.setTripStartDate(xpOrder.getBoardingTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); |
| | | itinerary.setTripStartDate(xpOrder.getBoardingTime()!=null?xpOrder.getBoardingTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")):""); |
| | | |
| | | itinerary.setCity(xpOrder.getCityName()); |
| | | itinerary.setStartPoint(xpOrder.getStartAddress()); |