From d800ed8f4f9c3a6dbd1b9833afc36a6a768495b9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 12:03:15 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 94 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 77 insertions(+), 17 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 a5b5d32..f2cab9a 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
@@ -352,6 +352,20 @@
//淇敼鍚�
String after = JSONObject.toJSONString(update);
+ //鎻掑叆铏氭嫙閿佸ご鍜岀珯鐐逛笂-------
+ Bikes bike = new Bikes();
+ bike.setIsdeleted(Constants.ZERO);
+ bike.setCode(model.getBikeCode());
+ bike.setSiteId(update.getBackSiteId());
+ bike.setLockId(update.getBackLockId());
+ if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
+ bike.setId(Constants.getUUID());
+ bike.setParamId(model.getParamId());
+ bike.setLastBackDate(model.getRentDate());
+ bike.setStatus(Constants.ZERO);
+ bike.setInfo("寮哄埗杩樿溅缁戝畾");
+ bikesMapper.insert(bike);
+ }
ActionLog log = new ActionLog();
log.setId(Constants.getUUID());
@@ -428,21 +442,6 @@
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
memberRides.setCloseStatus(Constants.ZERO);
- //涓存椂浣跨敤
- Bikes bikes = bikesMapper.selectById(locks.getBikeCode());
- if (Objects.isNull(bikes)) {
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌鑷杞︿俊鎭�");
- }
- memberRides.setBikeCode(bikes.getId());
- memberRides.setParamId(bikes.getParamId());
- memberRides.setRentSiteId(locks.getSiteId());
- memberRides.setRentLockId(locks.getId());
- memberRides.setRentDate(new Date());
- memberRides.setBasePrice(new BigDecimal(3990L));
- memberRides.setBaseTime(1800);
- memberRides.setUnitTime(600);
- memberRides.setUnitPrice(new BigDecimal(1000L));
-
memberRidesMapper.insert(memberRides);
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
}
@@ -489,6 +488,10 @@
Holidays holidays = new Holidays();
holidays.setHoliday(nowDate);
holidays.setIsdeleted(Constants.ZERO);
+ memberRides.setBikeCode(bike.getCode());
+ bike.setLastRentDate(new Date());
+ bike.setStatus(Constants.ONE);
+ bikesMapper.updateById(bike);
//妫�鏌ユ槸鍚﹁妭鍋囨棩
if(holidaysMapper.selectCount(new QueryWrapper<>(holidays)) >0){
//濡傛灉鏄妭鍋囨棩
@@ -527,6 +530,9 @@
*/
@Override
public int mqttLockInfoEvent(Locks locks){
+ if(StringUtils.isBlank(locks.getId()) ||StringUtils.isBlank(locks.getSiteId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"閿佸ご淇℃伅涓婃姤鍙傛暟閿欒锛�");
+ }
//鍒ゆ柇妫�鏌ュ鐞嗙珯鐐归攣澶翠俊鎭�
Locks model = dealLockAndSite(locks);
//杞﹁締璁板綍
@@ -543,7 +549,6 @@
if(memberRides == null){
return 0;
}
-
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
memberRidesMapper.updateById( memberRides);
}
@@ -582,7 +587,8 @@
//TODO-----JP------------鏍规嵁杞﹁締code鍒嗘瀽杞﹁締绫诲瀷锛屽緟纭鏂规-------------------
private String getBileTypeByCode(String bikeCode) {
- return null;
+ int temp=1+(int)(Math.random()*(8));
+ return temp+"";
}
private Locks dealLockAndSite(Locks locks) {
@@ -629,9 +635,63 @@
return model;
}
+ /**
+ * 杩樿溅璁㈤槄娑堟伅涓氬姟澶勭悊
+ * @param bikes
+ * @return
+ */
@Override
public int mqttCloseBikeEvent(MemberRides bikes){
+ //鍏嶈垂楠戣鏃堕暱鏌ヨ锛屾暟鎹瓧鍏搁厤缃�
+ if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"杩樿溅涓婃姤鍙傛暟閿欒锛�");
+ }
+ QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(MemberRides::getBikeCode, bikes.getBikeCode());
+ 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"));
+ if(memberRides!=null){
+ //杩涜
+ dealMemberRidesBack(memberRides,bikes);
+ }
return 0;
+ }
+ private void dealMemberRidesBack(MemberRides memberRides,MemberRides param) {
+ int freeTime = 0;
+ try {
+ freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
+ }catch (Exception e){
+ }
+ Date date = new Date();
+ MemberRides update = new MemberRides();
+ update.setEditDate(date);
+ update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
+ update.setBackDate(date);
+ update.setBackLockId(param.getBackLockId());
+ update.setBackSiteId(param.getBackSiteId());
+ update.setBackCommondId(param.getBackCommondId());
+ int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
+ update.setDuration(duration>0?duration:0);
+ update.setBackType(Constants.ONE);
+ update.setBackInfo("鐢ㄦ埛姝ｅ父杩樿溅");
+
+ 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"));
+ if(bikes != null ) {
+ UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.lambda().set(Bikes::getId, bikes.getId());
+ updateWrapper.lambda().set(Bikes::getEditDate,new Date());
+ updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
+ //鏇存柊鑷杞︽渶鍚庤繕杞︽椂闂�
+ bikesMapper.updateById(bikes);
+ }
+ //鏇存柊杩樿溅璁板綍涓哄凡杩樿溅
+ memberRidesMapper.updateById(update);
}
}
--
Gitblit v1.9.3