From 000c62b9a5b19197fcd93db6382841cedb0c4537 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 18:37:27 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 a466654..1302e95 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
@@ -244,6 +244,8 @@
Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
queryWrapper
.selectAs(MemberRides::getId,MemberRidesDTO::getId)
+ .selectAs(MemberRides::getDiscountPrice,MemberRidesDTO::getDiscountPrice)
+ .selectAs(MemberRides::getType,MemberRidesDTO::getType)
.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
.selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
.selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
@@ -386,6 +388,7 @@
Bikes bike = new Bikes();
bike.setIsdeleted(Constants.ZERO);
bike.setCode(model.getBikeCode());
+ bike.setType(model.getType());
bike.setSiteId(update.getBackSiteId());
bike.setLockId(update.getBackLockId());
if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
@@ -393,6 +396,7 @@
bike.setParamId(model.getParamId());
bike.setLastBackDate(model.getRentDate());
bike.setStatus(Constants.ZERO);
+ bike.setType(Constants.ZERO);
bike.setInfo("寮哄埗杩樿溅缁戝畾");
bikesMapper.insert(bike);
}
@@ -477,6 +481,7 @@
locks =new Locks();
locks.setCode(Constants.formatIntegerFromStr(codes[1]));
locks.setSiteId(codes[0]);
+ locks.setId(codes[1]);
deviceService.getLockInfo(locks);
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠杞﹁締鏆傛椂鏃犳硶浣跨敤锛岃绋嶅悗閲嶈瘯鎴栨洿鎹㈠叾瀹冭溅杈嗭紒");
}
@@ -495,10 +500,10 @@
memberRides.setRentLockId(locks.getCode());
memberRides.setOrdreId(goodsorder.getId());
memberRides.setRentDate(new Date());
+ memberRides.setType(Constants.ZERO);
memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
memberRides.setCloseStatus(Constants.ZERO);
-
memberRidesMapper.insert(memberRides);
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
}else{
@@ -604,7 +609,7 @@
//杞﹁締璁板綍
Bikes bikes = dealBikesByParam(model);
//鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
- if(locks.getStatus() == Constants.LockStatus.open){
+ if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.open){
//濡傛灉鏄紑閿佷笟鍔★紝鍒ゆ柇鏄惁鏈夊紑閿佷腑鐨勪俊鎭�
MemberRides memberRides = new MemberRides();
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
@@ -621,7 +626,7 @@
update.setId(memberRides.getId());
//锛堟洿鏂拌姹傚紑閿佷腑鐨勯攣澶村叧鑱旂殑楠戣璁板綍锛�
memberRidesMapper.updateById( update);
- }else if(locks.getStatus() == Constants.LockStatus.closed ){
+ }else if(Constants.formatIntegerNum(locks.getStatus()) == Constants.LockStatus.closed ){
//濡傛灉鏄叧閿佷笟鍔★紝鍒ゆ柇瑙﹀彂杩樿溅
if(StringUtils.isNotBlank(locks.getBikeCode())){
MemberRides mbikes = new MemberRides();
@@ -670,9 +675,9 @@
if (!CollectionUtils.isEmpty(memberRides)){
memberRides.forEach(s->{
Integer between = DateUtil.betweenSeconds(s.getCreateDate(), new Date());
- // 澶т簬闃堝��
+ // 澶т簬闃堝��,鑷姩璁句负寮�閿佹垚鍔燂紙濡傚疄闄呮湭寮�閿侊紝鑱旂郴绔欑偣绠＄悊鍛樺悗鍙拌繘琛屽己鍒惰繕杞︽搷浣滐級
if (between >= 20){
- s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
+ s.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
s.setEditDate(new Date());
memberRidesMapper.updateById(s);
}
@@ -716,6 +721,7 @@
bikes.setEditDate(bikes.getCreateDate());
bikes.setSiteId(model.getSiteId());
bikes.setLockId(model.getCode());
+ bikes.setType(Constants.ZERO);
bikes.setCode(model.getBikeCode());
bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
bikesMapper.insert(bikes);
--
Gitblit v1.9.3