From 7ec37d4b36111c0192f2c7674b07f8dd1daf1d53 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 18:35:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 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 05b0c97..2d6f01c 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,12 +234,14 @@
.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;
}
@Override
- public String getOnlineBike(String memberId){
+ public MemberRides getOnlineBike(String memberId){
MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
.eq("isdeleted", Constants.ZERO)
.eq("member_id",memberId)
@@ -247,7 +251,7 @@
if(Objects.isNull(memberRides)){
return null;
}
- return memberRides.getBikeCode();
+ return memberRides;
}
/**
@@ -430,7 +434,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鎵爜鏃犳晥锛屾湭鏌ヨ鍒伴攣澶翠俊鎭�");
}
//鏌ヨ閿佸ご鏄惁瀛樺湪杞﹁締 浠ュ強鏄惁姝ｅ父
- if (!locks.getStatus().equals(Constants.ZERO)) {
+ if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "褰撳墠鎵爜閿佸ご鐘舵�侀敊璇紝鏃犳硶杩涜寮�閿�");
}
if (StringUtils.isBlank(locks.getBikeCode())) {
@@ -541,8 +545,9 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public int mqttLockInfoEvent(Locks locks){
- if(StringUtils.isBlank(locks.getId()) ||StringUtils.isBlank(locks.getSiteId())){
+ if(StringUtils.isBlank(locks.getCode()) ||StringUtils.isBlank(locks.getSiteId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閿佸ご淇℃伅涓婃姤鍙傛暟閿欒锛�");
}
//鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
@@ -554,14 +559,19 @@
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
MemberRides memberRides = new MemberRides();
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
- memberRides.setRentLockId(model.getId());
+ memberRides.setRentLockId(model.getCode());
+ memberRides.setRentSiteId(model.getSiteId());
memberRides.setIsdeleted(Constants.ZERO);
memberRides = findOne(memberRides);
if(memberRides == null){
return 0;
}
+ MemberRides update = new MemberRides();
+ update.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
+ update.setEditDate(new Date());
+ update.setId(memberRides.getId());
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
- memberRidesMapper.updateById( memberRides);
+ memberRidesMapper.updateById( update);
}
return 0;
}
@@ -570,7 +580,7 @@
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("last 1"));
+ Bikes bikes = bikesMapper.selectOne(wrapper.last("limit 1"));
if(bikes != null ) {
if ( StringUtils.equals(model.getBikeCode(), bikes.getCode())){
//濡傛灉缁戝畾杞﹁締淇℃伅鍙戠敓缂栧彿锛屾洿鎹㈢粦瀹氬叧绯�
@@ -582,6 +592,15 @@
bikesMapper.updateById(bikes);
}
}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);
@@ -615,7 +634,7 @@
param.setSortnum(Integer.parseInt(type));
param = baseParamMapper.selectOne(new QueryWrapper<>(param).lambda().last("limit 1" ));
if(param == null){
- return null;
+ return type;
}
return param.getId();
}
@@ -635,6 +654,7 @@
sites.setId(locks.getSiteId());
sites.setCreateDate(date);
sites.setStatus(Constants.ZERO);
+ sites.setEditDate(date);
sites.setLockNum(1);
//鏂板閿佸ご
sitesMapper.insert(sites);
@@ -652,14 +672,15 @@
model.setStatus(locks.getStatus());
locksMapper.insert(model);
}else{
- model.setSiteId(locks.getSiteId());
- model.setIsdeleted(Constants.ZERO);
- model.setCode(locks.getCode());
- model.setId(locks.getSiteId());
- model.setEditDate(date);
- model.setBikeCode(locks.getBikeCode());
- model.setStatus(locks.getStatus());
- locksMapper.update(null, new QueryWrapper<>(model));
+ UpdateWrapper<Locks> updateWrapper = new UpdateWrapper<Locks>();
+ updateWrapper.lambda().eq(Locks::getCode, locks.getCode() );
+ updateWrapper.lambda().eq(Locks::getSiteId, locks.getSiteId() );
+ updateWrapper.lambda().set(Locks::getBikeCode, locks.getBikeCode() );
+ 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);
return model;
@@ -671,6 +692,7 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public int mqttCloseBikeEvent(MemberRides bikes){
//鍏嶈垂楠戣鏃堕暱鏌ヨ锛屾暟鎹瓧鍏搁厤缃�
if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
@@ -681,7 +703,7 @@
wrapper.lambda().eq(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
//鏍规嵁杞﹁締缂栫爜鏌ヨ楠戣涓殑楠戣璁板綍淇℃伅锛屽鏋滄湁杩涜杩樿溅鎿嶄綔
- MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("last 1"));
+ MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit 1"));
if(memberRides!=null){
//杩涜
dealMemberRidesBack(memberRides,bikes);
--
Gitblit v1.9.3