From 538938d540cb71d6c17478d1d53b1e9da24334c9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 11:52:00 +0800
Subject: [PATCH] # log日志
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 342a6cf..bbf8103 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
@@ -189,6 +189,15 @@
public PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap) {
IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ MemberRidesQuery model = pageWrap.getModel();
+ //宸茶繕杞�
+ if (Objects.nonNull(model.getHasBack()) && model.getHasBack()){
+ queryWrapper.eq(MemberRides::getStatus,Constants.TWO);
+ }
+ //鏈綊杩樼殑
+ if (Objects.nonNull(model.getHasBack()) && !model.getHasBack()){
+ queryWrapper.eq(MemberRides::getStatus,Constants.ONE);
+ }
IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
initBikeLogObj(bikeLogDTOIPage.getRecords());
return PageData.from(bikeLogDTOIPage);
@@ -221,7 +230,7 @@
queryWrapper.ge(MemberRides::getRentDate, Utils.Date.getStart(model.getStartDate()));
}
if (Objects.nonNull(model.getEndDate())) {
- queryWrapper.le(MemberRides::getRentDate, Utils.Date.getStart(model.getEndDate()));
+ queryWrapper.le(MemberRides::getRentDate, Utils.Date.getEnd(model.getEndDate()));
}
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
@@ -599,6 +608,7 @@
// 澶т簬闃堝��
if (between > 2){
s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
+ s.setEditDate(new Date());
memberRidesMapper.updateById(s);
}
});
@@ -678,6 +688,7 @@
Date date =new Date();
//妫�鏌ョ珯鐐逛俊鎭紝涓嶅瓨鍦ㄥ垯鏂板
Sites sites = sitesMapper.selectById(locks.getSiteId());
+
if(sites == null){
sites = new Sites();
sites.setIsdeleted(Constants.ZERO);
@@ -691,6 +702,15 @@
//鏂板閿佸ご
sitesMapper.insert(sites);
}
+ if(StringUtils.isNotBlank(locks.getBikeCode())){
+ UpdateWrapper<Locks> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().set(Locks::getBikeCode, null );
+ updateWrapper.lambda().set(Locks::getEditDate, new Date() );
+ updateWrapper.lambda().eq(Locks::getBikeCode, locks.getBikeCode() );
+ //娓呯┖鍘熸潵鐨勮嚜琛岃溅缁戝畾鍏崇郴
+ locksMapper.update(null, updateWrapper);
+ }
+
if(model == null){
//濡傛灉閿佸ご涓嶅瓨鍦紝鍒ゆ柇瀛樺偍
model = new Locks();
--
Gitblit v1.9.3