From 5cd7b2fc0df22213a58bf8181e519482b3e4447d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 17:46:51 +0800
Subject: [PATCH] # 时间设置
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 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..24b3669 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);
@@ -579,6 +580,27 @@
return 0;
}
+
+ @Override
+ public void autoRefreshLockStatus() {
+
+ QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING.getKey())
+ .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