From a3698ecb84be4192754d7b2092491e727dbccec7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 六月 2025 16:51:02 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java
index b2fe1fa..a0226d9 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java
@@ -3,20 +3,17 @@
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.service.INettyService;
-import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.EndPushWarpper;
import com.stylefeng.guns.modular.system.warpper.OrderServerWarpper;
-import com.stylefeng.guns.modular.system.warpper.OrderStatusWarpper;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.List;
@Service
@@ -32,6 +29,9 @@
private IOrderCrossCityService orderCrossCityService;
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
+
/**
* 获取下单推送完后没有司机接单的提醒
* @param uid
@@ -41,7 +41,7 @@
@Override
public ResultUtil<EndPushWarpper> queryEndPush(Integer orderId, Integer orderType, Integer uid) throws Exception {
EndPushWarpper endPushWarpper = null;
- switch (orderType){
+ switch (orderType) {
case 1:
endPushWarpper = orderPrivateCarService.queryEndPush(uid);
break;
@@ -51,14 +51,10 @@
}
return ResultUtil.success(endPushWarpper);
}
-
-
-
- @Resource
- private RedisUtil redisUtil;
-
+
/**
* 获取服务中的订单数据
+ *
* @param uid
* @return
* @throws Exception
@@ -82,19 +78,19 @@
//从redis中拿取最后的距离参数
- String value = redisUtil.getValue("DISTANCE:"+orderServerWarpper.getState()+":"+ orderId);
+ String value = (String) redisTemplate.opsForValue().get("DISTANCE:" + orderServerWarpper.getState() + ":" + orderId);
if (value==null){
- redisUtil.setStrValue("DISTANCE:" + orderId,reservationMileage);
+ redisTemplate.opsForValue().set("DISTANCE:" + orderId, reservationMileage);
String s = new BigDecimal(reservationMileage).setScale(2, RoundingMode.HALF_UP).toString();
orderServerWarpper.setReservationMileage(s);
}else {
//最近的一次距离
- String recent = redisUtil.getValue("DISTANCE:"+orderServerWarpper.getState()+":"+orderId);
- BigDecimal recentDecimal = new BigDecimal(recent).setScale(2, RoundingMode.HALF_UP);
+ String recent = (String) redisTemplate.opsForValue().get("DISTANCE:" + orderServerWarpper.getState() + ":" + orderId);
+ BigDecimal recentDecimal = new BigDecimal(recent).setScale(2, RoundingMode.HALF_UP);
BigDecimal bigDecimal = new BigDecimal(reservationMileage).setScale(2, RoundingMode.HALF_UP);
if (bigDecimal.compareTo(recentDecimal)<0){
- orderServerWarpper.setReservationMileage(bigDecimal.toString());
- redisUtil.setStrValue("DISTANCE:" +orderServerWarpper.getState()+":"+ orderId,reservationMileage);
+ orderServerWarpper.setReservationMileage(bigDecimal.toString());
+ redisTemplate.opsForValue().set("DISTANCE:" + orderServerWarpper.getState() + ":" + orderId, reservationMileage);
}else {
orderServerWarpper.setReservationMileage(recentDecimal.toString());
}
@@ -103,19 +99,19 @@
}
String reservationTime = orderServerWarpper.getReservationTime();
if (reservationTime!=null){
- String value = redisUtil.getValue("TIME:"+orderServerWarpper.getState()+":"+ orderId);
+ String value = (String) redisTemplate.opsForValue().get("TIME:" + orderServerWarpper.getState() + ":" + orderId);
if (value==null){
- redisUtil.setStrValue("TIME:" + orderId,reservationTime);
+ redisTemplate.opsForValue().set("TIME:" + orderId, reservationTime);
String s = new BigDecimal(reservationTime).setScale(2, RoundingMode.HALF_UP).toString();
orderServerWarpper.setReservationTime(s);
}else {
//最近的一次距离
- String recent = redisUtil.getValue("TIME:"+orderServerWarpper.getState()+":"+orderId);
- BigDecimal recentDecimal = new BigDecimal(recent).setScale(2, RoundingMode.HALF_UP);
+ String recent = (String) redisTemplate.opsForValue().get("TIME:" + orderServerWarpper.getState() + ":" + orderId);
+ BigDecimal recentDecimal = new BigDecimal(recent).setScale(2, RoundingMode.HALF_UP);
BigDecimal bigDecimal = new BigDecimal(reservationTime).setScale(2, RoundingMode.HALF_UP);
if (bigDecimal.compareTo(recentDecimal)<0){
- orderServerWarpper.setReservationTime(bigDecimal.toString());
- redisUtil.setStrValue("TIME:" +orderServerWarpper.getState()+":"+ orderId,reservationTime);
+ orderServerWarpper.setReservationTime(bigDecimal.toString());
+ redisTemplate.opsForValue().set("TIME:" + orderServerWarpper.getState() + ":" + orderId, reservationTime);
}else {
orderServerWarpper.setReservationTime(recentDecimal.toString());
}
--
Gitblit v1.7.1