From b52604d53c7568a522f2e0b471a72dbcd4d022fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 03 十一月 2023 08:49:48 +0800
Subject: [PATCH] 硬件协议对接
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 6126046..16e2496 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
@@ -584,7 +584,7 @@
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
- if(model.getStatus() == Constants.LockStatus.open){
+ if(locks.getStatus() == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
MemberRides memberRides = new MemberRides();
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
@@ -644,12 +644,15 @@
if(bikes != null ) {
if ( !StringUtils.equals(model.getBikeCode(), bikes.getCode())){
//濡傛灉缁戝畾杞﹁締淇℃伅鍙戠敓缂栧彿锛屾洿鎹㈢粦瀹氬叧绯�
+ String type =getBileTypeByCode(model.getBikeCode());
UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
- updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
+ updateWrapper.lambda().set(Bikes::getParamId,type);
//鏇存柊鑷绔欑偣閿佸ご缁戝畾鑷杞︿俊鎭�
bikesMapper.update(null,updateWrapper);
+ bikes.setCode(model.getBikeCode());
+ bikes.setParamId(model.getBikeType());
}
}else{
bikes = new Bikes();
@@ -751,6 +754,8 @@
updateWrapper.lambda().set(Locks::getEditDate, new Date() );
updateWrapper.lambda().set(Locks::getIsdeleted, Constants.ZERO);
locksMapper.update(null,updateWrapper);
+ model.setStatus(locks.getStatus());
+ model.setBikeCode(locks.getBikeCode());
}
model.setSites(sites);
return model;
@@ -769,6 +774,7 @@
locks.setCode(bikes.getBackLockId());
locks.setBikeCode(bikes.getBikeCode());
locks.setInfo(bikes.getBackCommondId());
+ locks.setStatus(bikes.getStatus());
//澶勭悊閿佸ご鏁版嵁
mqttLockInfoEvent(locks);
//鍏嶈垂楠戣鏃堕暱鏌ヨ锛屾暟鎹瓧鍏搁厤缃�
--
Gitblit v1.9.3