From a0af42a6acfc7a0ebbb92bffc1816525e508af70 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 十月 2025 16:54:06 +0800
Subject: [PATCH] 修改bug
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCheckServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCheckServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCheckServiceImpl.java
index a1100fc..1f71833 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCheckServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCheckServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.google.common.collect.Lists;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.shiro.ShiroKit;
@@ -24,6 +25,7 @@
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.PushUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import java.util.concurrent.TimeUnit;
import com.stylefeng.guns.modular.system.warpper.PushOrderInfoWarpper;
@@ -72,6 +74,9 @@
@Resource
private RedisTemplate<String, String> redisTemplate;
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
/**
* 订单推送逻辑
*/
@@ -98,7 +103,7 @@
public Page<TOrderCheck> getOrderCheckList(String createTime, String code, Integer source, String userName, String userPhone, Integer state, String driverName) {
//获取当前登录用户身份
boolean admin = ShiroKit.isAdmin();
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
String startTime = null;
String endTime = null;
// 开始，结束时间
@@ -191,7 +196,7 @@
Page<DriverDispatchInfoResp> page = new PageFactory<DriverDispatchInfoResp>().defaultPage();
//获取当前登录信息
boolean admin = ShiroKit.isAdmin();
- Integer branchOfficeId = admin ? null : ShiroKit.getUser().getObjectId();
+ Integer branchOfficeId = admin ? null : shiroExtUtil.getUser().getObjectId();
// 查询有车检服务权限的司机列表（支持搜索）
List<DriverDispatchInfoResp> driverList = tDriverMapper.queryCheckServiceDriversWithSearch(page,
1, // checkServer = 1 (有车检服务权限)
@@ -244,8 +249,8 @@
TOrderCheck updateOrder = new TOrderCheck();
updateOrder.setId(orderId);
updateOrder.setState(OrderStateEnum.PENDING_ORDER.getCode()); // 设置为待接单状态
- updateOrder.setOperatorId(ShiroKit.getUser().getId());
- updateOrder.setOperatorName(ShiroKit.getUser().getName());
+ updateOrder.setOperatorId(shiroExtUtil.getUser().getId());
+ updateOrder.setOperatorName(shiroExtUtil.getUser().getName());
updateOrder.setDispatchTime(new Date());
this.updateById(updateOrder);
}
@@ -395,7 +400,7 @@
// 设置默认状态（正常）
order.setStatus(1);
//设置分公司id
- order.setBranchOfficeId(ShiroKit.getUser().getObjectId());
+ order.setBranchOfficeId(shiroExtUtil.getUser().getObjectId());
//处理费用
handleOrderPrice(order.getBranchOfficeId(), order);
// 保存订单
@@ -438,7 +443,7 @@
String userName, String userPhone, Integer state, String driverName) {
//获取当前登录用户身份
boolean admin = ShiroKit.isAdmin();
- Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer objectId = shiroExtUtil.getUser().getObjectId();
String startTime = null;
String endTime = null;
// 开始，结束时间
--
Gitblit v1.7.1