From 9eeb62c02a7b3c7b95c20678b6a9c74e7f12f943 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 01 七月 2026 18:15:10 +0800
Subject: [PATCH] Merge branch '3.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 3.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 3058614..e6eecdd 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
@@ -9,6 +9,7 @@
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.track.RideActiveCache;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -35,6 +36,7 @@
import com.doumee.service.business.MemberRidesService;
import com.doumee.service.system.SystemDictDataService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
@@ -55,6 +57,7 @@
* @author 姹熻箘韫�
* @date 2023/09/27 18:06
*/
+@Slf4j
@Service
public class MemberRidesServiceImpl implements MemberRidesService {
@@ -93,6 +96,9 @@
@Autowired
private SystemDictDataMapper systemDictDataMapper;
+ /** 鐢佃溅娲昏穬璁㈠崟缂撳瓨(platform 鍚庡彴寮哄埗杩樿溅鏃跺垹) */
+ @Autowired
+ private RideActiveCache rideActiveCache;
@Override
public String create(MemberRides memberRides) {
@@ -407,6 +413,12 @@
update.setDuration( rideTime > freeRentTime ? rideTime : 0 );
//update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
memberRidesMapper.updateById(update);
+ // 寮哄埗杩樿溅鈫掑凡杩樿溅:鍒犻櫎娲昏穬璁㈠崟缂撳瓨(鐢佃溅鎵嶆湁杞ㄨ抗;鑷杞� key 涓嶅瓨鍦�,鍒犻櫎涓� no-op 鏃犲)
+ try {
+ rideActiveCache.remove(model.getBikeCode());
+ } catch (Exception e) {
+ log.warn("鍒犻櫎娲昏穬璁㈠崟缂撳瓨澶辫触 bikeCode={}", model.getBikeCode(), e);
+ }
//淇敼鍓�
String beforeContent = JSONObject.toJSONString(model);
//淇敼鍚�
@@ -807,6 +819,7 @@
}
memberRidesResponse.setBikeCode(bike.getCode());
memberRidesResponse.setBikeType(baseParam.getName());
+ memberRidesResponse.setRidesType(bikeType);
MemberRides memberRides = new MemberRides();
this.dealMemberRidesData(baseParam.getId(),memberRides);
memberRidesResponse.setBasePrice(memberRides.getBasePrice());
--
Gitblit v1.9.3