attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:2727b3ab7f94c9cc1b96400e2555b57bdc5c596a
Branches Tags
attiya:main
..
compare: attiya:b39179f3851539b1a570fa15a42e195c684e507d
Branches Tags
attiya:main

No commits in common. "2727b3ab7f94c9cc1b96400e2555b57bdc5c596a" and "b39179f3851539b1a570fa15a42e195c684e507d" have entirely different histories.
2727b3ab7f ... b39179f385

1 changed files with 18 additions and 44 deletions
Show Stats Expand all files Collapse all files

62
ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
View File

@ -313,7 +313,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
@Override @Override
public RspOrderDetailsInfo orderDetailsInfo(Long orderId) { public RspOrderDetailsInfo orderDetailsInfo(Long orderId) {
return this.mapper.selectOneWithRelationsByIdAs(orderId, RspOrderDetailsInfo.class); return this.mapper.selectOneWithRelationsByIdAs(orderId,RspOrderDetailsInfo.class);
} }
@Override @Override
@ -418,49 +418,23 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
* @return 当前时间段收取金额 * @return 当前时间段收取金额
*/ */
BigDecimal timeFee(TimeSegment timeSegment, ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto, List<EbikeOrderDetails> list, long orderId) { BigDecimal timeFee(TimeSegment timeSegment, ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto, List<EbikeOrderDetails> list, long orderId) {
BigDecimal decimal = BigDecimal.ZERO; BigDecimal decimal = new BigDecimal(0);
// LocalDateTime start = timeSegment.getStart(); LocalDateTime start = timeSegment.getStart();
// LocalDateTime end = timeSegment.getEnd(); LocalDateTime end = timeSegment.getEnd();
// LocalTime orderStartupTime = LocalTime.of(start.getHour(), start.getMinute(), start.getSecond()); LocalTime orderStartupTime = LocalTime.of(start.getHour(), start.getMinute(), start.getSecond());
// LocalTime orderEndTime = LocalTime.of(end.getHour(), end.getMinute(), end.getSecond()); LocalTime orderEndTime = LocalTime.of(end.getHour(), end.getMinute(), end.getSecond());
// boolean checkedStart = false; List<ResFeignEbikeSysRcostsetTimePeriodDto> ebikeSysRcostsetTimePeriodDtos = feignEbikeSysRcostsetDto.getEbikeSysRcostsetTimePeriodDtos();
// List<ResFeignEbikeSysRcostsetTimePeriodDto> ebikeSysRcostsetTimePeriodDtos = feignEbikeSysRcostsetDto.getEbikeSysRcostsetTimePeriodDtos(); //收集订单所满足计费条件的所有时段费用
// //收集订单所满足计费条件的所有时段费用 for (ResFeignEbikeSysRcostsetTimePeriodDto timePeriodDto : ebikeSysRcostsetTimePeriodDtos) {
// for (ResFeignEbikeSysRcostsetTimePeriodDto timePeriodDto : ebikeSysRcostsetTimePeriodDtos) { LocalTime timePeriodDtoStartupTime = timePeriodDto.getStartupTime();
// LocalTime timePeriodDtoStartupTime = timePeriodDto.getStartupTime(); LocalTime timePeriodDtoEndTime = timePeriodDto.getEndTime();
// LocalTime timePeriodDtoEndTime = timePeriodDto.getEndTime(); boolean createBeforeTimePeriodDtoEndTime = orderStartupTime.isBefore(timePeriodDtoEndTime);
// boolean createBeforeTimePeriodDtoEndTime = orderStartupTime.isBefore(timePeriodDtoEndTime); boolean createAfterTimePeriodDtoStartupTime = orderEndTime.isAfter(timePeriodDtoStartupTime);
// boolean createAfterTimePeriodDtoStartupTime = orderEndTime.isAfter(timePeriodDtoStartupTime); //满足计费条件，进行计费
// //满足计费条件，进行计费 if (createBeforeTimePeriodDtoEndTime && createAfterTimePeriodDtoStartupTime) {
// if (createBeforeTimePeriodDtoEndTime && createAfterTimePeriodDtoStartupTime) {
// //起点在高峰内 }
// boolean after = orderStartupTime.isAfter(timePeriodDtoStartupTime); }
// boolean before = orderEndTime.isBefore(timePeriodDtoEndTime);
// if (after) {
// //添加起步费用
// BigDecimal startupCost = timePeriodDto.getStartupCost();
// Integer startupDuration = timePeriodDto.getStartupDuration();
// decimal = decimal.add(startupCost);
// long minutes = TimeUtils.betweenMinutes(orderStartupTime, orderEndTime);
// BigDecimal minutesNew = new BigDecimal(minutes);
// if (minutes > startupDuration) {
// BigDecimal startupDurationNew = new BigDecimal(startupDuration);
// BigDecimal subtract = minutesNew.subtract(startupDurationNew);
// //结束点在高峰内
// if (before) {
// BigDecimal durationCost = timePeriodDto.getDurationCost();
// Integer duration = timePeriodDto.getDuration();
// int ceil = NumberUtils.divideAndCeil(duration, subtract.intValue());
// BigDecimal ceilCost = BigDecimal.valueOf(ceil);
// //最终值
// BigDecimal multiply = durationCost.multiply(ceilCost);
// decimal = decimal.add(multiply);
// }
// }
// }
//
// }
// }
//计算常规费用 //计算常规费用
return decimal; return decimal;
} }