From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 25 十月 2023 09:58:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java index 6aabdb9..4560cf1 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java @@ -217,8 +217,8 @@ .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId) .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid()) .like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode()); - queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart()); - queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd()); + queryWrapper.ge(model.getStartDate()!=null, MemberRides::getRentDate,model.getStartDate()); + queryWrapper.le(model.getEndDate()!=null, MemberRides::getRentDate,model.getEndDate()); queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus()); queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus()); queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId()); @@ -299,7 +299,7 @@ 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); @@ -357,7 +357,8 @@ 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); @@ -382,7 +383,7 @@ 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); -- Gitblit v1.9.3