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 | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 781768b..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,17 +299,17 @@
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);
log.setUserId(user.getId());
log.setUserType(Constants.ONE);
log.setParam(JSONObject.toJSONString(memberRides ));
- log.setType(Constants.ActionLogObjType.memberrides);
+ log.setObjType(Constants.ActionLogObjType.memberrides);
log.setResult(Constants.ZERO);
log.setObjId(model.getId());
- log.setObjType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
+ log.setType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getName());
//璁板綍鎿嶄綔鏃ュ織
@@ -338,7 +338,7 @@
}
QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
+ .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK,Constants.FREE_RENT_TIME));
List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));
@@ -354,8 +354,11 @@
update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
update.setBackSiteId(collect.get(Constants.FORCE_BACK_SITE).getCode());
update.setBackLockId(collect.get(Constants.FORCE_BACK_LOCK).getCode());
+ Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
+ Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
//璁＄畻楠戣璁¤垂鏃堕暱
- update.setDuration(DateUtil.betweenMin(model.getRentDate(), update.getBackDate()));
+ update.setDuration( rideTime > freeRentTime ? rideTime : 0 );
+ //update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
memberRidesMapper.updateById(update);
//淇敼鍓�
String beforeContent = JSONObject.toJSONString(model);
@@ -380,17 +383,17 @@
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);
log.setUserId(user.getId());
log.setUserType(Constants.ONE);
log.setParam(JSONObject.toJSONString(memberRides ));
- log.setType(Constants.ActionLogObjType.memberrides);
+ log.setObjType(Constants.ActionLogObjType.memberrides);
log.setResult(Constants.ZERO);
log.setObjId(model.getId());
- log.setObjType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
+ log.setType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.FORCE_BACK.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.FORCE_BACK.getName());
log.setActInfo(memberRides.getBackInfo());
@@ -577,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