From c6faae18b9e8fa2bdf9e00aecac4e8152b09ef76 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 25 十月 2023 10:20:33 +0800 Subject: [PATCH] # 用户禁用 --- server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 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 2ed0440..415a812 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); @@ -383,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); @@ -580,6 +580,27 @@ return 0; } + + @Override + public void autoRefreshLockStatus() { + + QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING) + .eq(MemberRides::getIsdeleted,Constants.ZERO); + List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper); + if (!CollectionUtils.isEmpty(memberRides)){ + memberRides.forEach(s->{ + Integer between = DateUtil.between(s.getCreateDate(), new Date()); + // 澶т簬闃堝�� + if (between > 2){ + s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey()); + memberRidesMapper.updateById(s); + } + }); + } + } + private Bikes dealBikesByParam(Locks model) { if(StringUtils.isNotBlank(model.getBikeCode())){ UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>(); -- Gitblit v1.9.3