From 694030733daa2e8b2f90f526b4ecb1a230a89136 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 18 十月 2023 11:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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..2ebd8ab 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;
}
@@ -472,7 +476,6 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒");
}
Date date =new Date();
-
QueryWrapper<PricingParam> param = new QueryWrapper<>();
param.lambda().eq(PricingParam::getStatus,Constants.ZERO);
param.lambda().eq(PricingParam::getIsdeleted,Constants.ZERO);
@@ -573,30 +576,31 @@
}
private Bikes dealBikesByParam(Locks model) {
+ if(StringUtils.isNotBlank(model.getBikeCode())){
+ UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().set(Bikes::getCode, null );
+ updateWrapper.lambda().set(Bikes::getParamId, null );
+ updateWrapper.lambda().set(Bikes::getEditDate, new Date() );
+ updateWrapper.lambda().eq(Bikes::getCode, model.getBikeCode() );
+ //娓呯┖鍘熸潵鐨勮嚜琛岃溅缁戝畾鍏崇郴
+ bikesMapper.update(null, updateWrapper);
+ }
+
QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(Bikes::getLockId, model.getCode());
wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
Bikes bikes = bikesMapper.selectOne(wrapper.last("limit 1"));
if(bikes != null ) {
- if ( StringUtils.equals(model.getBikeCode(), bikes.getCode())){
+ if ( !StringUtils.equals(model.getBikeCode(), bikes.getCode())){
//濡傛灉缁戝畾杞﹁締淇℃伅鍙戠敓缂栧彿锛屾洿鎹㈢粦瀹氬叧绯�
UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
- updateWrapper.lambda().set(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
//鏇存柊鑷绔欑偣閿佸ご缁戝畾鑷杞︿俊鎭�
- bikesMapper.updateById(bikes);
+ bikesMapper.update(null,updateWrapper);
}
}else{
- if(StringUtils.isNotBlank(model.getBikeCode())){
- UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
- updateWrapper.lambda().set(Bikes::getCode, null );
- updateWrapper.lambda().set(Bikes::getParamId, null );
- updateWrapper.lambda().set(Bikes::getEditDate, new Date() );
- updateWrapper.lambda().eq(Bikes::getCode, model.getCode() );
- //娓呯┖鍘熸潵鐨勮嚜琛岃溅缁戝畾鍏崇郴
- bikesMapper.update(null, updateWrapper);
- }
bikes = new Bikes();
bikes.setId(Constants.getUUID());
bikes.setIsdeleted(Constants.ZERO);
@@ -621,7 +625,7 @@
return null;
}
String type = bikeCode.substring(0,1);
- if(Constants.BIKE_TYPE.contains(type)){
+ if(!Constants.BIKE_TYPE.contains(type)){
return null;
}
BaseParam param = new BaseParam();
@@ -675,7 +679,6 @@
updateWrapper.lambda().set(Locks::getStatus, locks.getStatus() );
updateWrapper.lambda().set(Locks::getEditDate, new Date() );
updateWrapper.lambda().set(Locks::getIsdeleted, Constants.ZERO);
-
locksMapper.update(null,updateWrapper);
}
model.setSites(sites);
@@ -725,19 +728,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