| | |
| | | log.setActInfo(memberRides.getBackInfo()); |
| | | log.setActReason(memberRides.getBackReason()); |
| | | log.setIsdeleted(Constants.ZERO); |
| | | log.setCreateDate(update.getBackDate()); |
| | | log.setCreateDate(new Date()); |
| | | log.setCreator(user.getId()); |
| | | log.setBeforeContent(beforeContent); |
| | | log.setAfterContent(after); |
| | |
| | | Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode()); |
| | | Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate()); |
| | | //计算骑行计费时长 |
| | | update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime); |
| | | update.setDuration( rideTime > freeRentTime ? rideTime : 0 ); |
| | | //update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime); |
| | | memberRidesMapper.updateById(update); |
| | | //修改前 |
| | | String beforeContent = JSONObject.toJSONString(model); |
| | |
| | | ActionLog log = new ActionLog(); |
| | | log.setId(Constants.getUUID()); |
| | | log.setIsdeleted(Constants.ZERO); |
| | | log.setCreateDate(update.getBackDate()); |
| | | log.setCreateDate(new Date()); |
| | | log.setCreator(user.getId()); |
| | | log.setBeforeContent(beforeContent); |
| | | log.setAfterContent(after); |