server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -641,7 +641,7 @@ memberRidesResponse.setUnitTime(s.getUnitTime()); if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(s.getStatus()))){ //如果是骑行中 s.setDuration(rideTime> finalFreeTime ?(rideTime- finalFreeTime):0); s.setDuration(rideTime> finalFreeTime ?(rideTime):0); } s.setRideTime(rideTime); return memberRidesResponse; server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -728,7 +728,9 @@ update.setBackLockId(param.getBackLockId()); update.setBackSiteId(param.getBackSiteId()); update.setBackCommondId(param.getBackCommondId()); int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime; // int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime; int min = DateUtil.betweenMin(memberRides.getRentDate(),date);//实际骑行时间 int duration = min>freeTime?min:0; update.setDuration(duration>0?duration:0); update.setBackType(Constants.ONE); update.setBackInfo("用户正常还车");
