From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 13 +++++++++----
1 files changed, 9 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 2b0c3d3..eaeb724 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
@@ -221,6 +221,8 @@
queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
+ queryWrapper.in(MemberRides::getStatus,
+ Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
queryWrapper
.selectAs(MemberRides::getId,MemberRidesDTO::getId)
.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
@@ -232,7 +234,9 @@
.selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
.selectAs(MemberRides::getRentLockId,MemberRidesDTO::getRentLockId)
.selectAs(MemberRides::getRentSiteId,MemberRidesDTO::getRentSiteId)
- .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+ .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate)
+ .selectAs(MemberRides::getBackSiteId,MemberRidesDTO::getBackSiteId)
+ .selectAs(MemberRides::getBackLockId,MemberRidesDTO::getBackLockId);
return queryWrapper;
}
@@ -725,19 +729,20 @@
update.setDuration(duration>0?duration:0);
update.setBackType(Constants.ONE);
update.setBackInfo("鐢ㄦ埛姝ｅ父杩樿溅");
+ update.setId(memberRides.getId());
Bikes bikes = new Bikes();
bikes.setSiteId(memberRides.getBackSiteId());
bikes.setLockId(memberRides.getBackLockId());
// bikes.setCode(memberRides.getBikeCode());
- bikes = bikesMapper.selectById(new QueryWrapper<>(bikes).last("limit 1"));
+ bikes = bikesMapper.selectOne(new QueryWrapper<>(bikes).last("limit 1"));
if(bikes != null ) {
UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
- updateWrapper.lambda().set(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
updateWrapper.lambda().set(Bikes::getEditDate,new Date());
updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
//鏇存柊鑷杞︽渶鍚庤繕杞︽椂闂�
- bikesMapper.updateById(bikes);
+ bikesMapper.update(null,updateWrapper);
}
//鏇存柊杩樿溅璁板綍涓哄凡杩樿溅
memberRidesMapper.updateById(update);
--
Gitblit v1.9.3