From b1d6ef2cd40bc439d720c7ef0d064cfbe0643580 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 27 四月 2025 17:25:36 +0800
Subject: [PATCH] 大屏接口
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index 751c48b..98e339a 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -327,8 +327,8 @@
order.setServerName(masterWorker.getRealName());
order.setServerPhone(masterWorker.getPhone());
order.setAcceptTime(new Date());
- // 待上门
- order.setState(Constants.ONE);
+ // 待上门 2.0 改为待预约
+ order.setState(7);
} else {
// 待派单状态
order.setState(Constants.ZERO);
@@ -711,11 +711,11 @@
public R<List<MasterWorker>> map(String cityCode,String name) {
LoginUser loginUser = tokenService.getLoginUser();
- if (null == loginUser) {
- return R.loginExpire("登录失效！");
- }
+// if (null == loginUser) {
+// return R.loginExpire("登录失效！");
+// }
if (cityCode==null) {
- if (loginUser.getIsFranchisee()) {
+ if (loginUser!=null&&loginUser.getIsFranchisee()) {
cityCode = loginUser.getCityList().get(0);
} else {
cityCode = "420100";
--
Gitblit v1.7.1