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 | 10 ++++------
1 files changed, 4 insertions(+), 6 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 8ac7cff..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);
@@ -312,7 +312,6 @@
log.setType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
log.setContent(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getInfo());
log.setTitle(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getName());
- log.setActInfo(memberRides.getInfo());
//璁板綍鎿嶄綔鏃ュ織
actionLogMapper.insert(log);
@@ -384,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);
@@ -399,7 +398,6 @@
log.setTitle(Constants.ACTIONLOG_TYPE.FORCE_BACK.getName());
log.setActInfo(memberRides.getBackInfo());
log.setActReason(memberRides.getBackReason());
- log.setActInfo(memberRides.getInfo());
//璁板綍鎿嶄綔鏃ュ織
actionLogMapper.insert(log);
--
Gitblit v1.9.3