From 428519bd1056dd90cd4589dbf85b380e403ff254 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 05 七月 2024 18:13:08 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/OrderServiceImpl.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/OrderServiceImpl.java
index 18eef66..f4e2dd7 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/OrderServiceImpl.java
@@ -24,23 +24,20 @@
@Override
public List<Order> orderList(Integer userid, Integer state) {
- LambdaQueryChainWrapper<Order> wrapper = lambdaQuery().eq(Order::getIsDelete, 0)
- .eq(Order::getType, 0);
+ LambdaQueryChainWrapper<Order> wrapper = lambdaQuery()
+ .eq(Order::getIsDelete, 0);
// 查询所有订单/待上门/已完结订单
- if (Constants.ZERO.equals(state)) {
- wrapper.in(Order::getState, 1, 2, 3, 4, 5);
- } else if (Constants.ONE.equals(state)) {
- wrapper.eq(Order::getState, 1);
+ if (Constants.ONE.equals(state)) {
+ wrapper.in(Order::getState, 1, 2);
} else if (Constants.TWO.equals(state)) {
wrapper.eq(Order::getState, 3);
- } else {
- wrapper.in(Order::getState, 1, 2, 3, 4, 5);
}
- return wrapper.list();
+ List<Order> list = baseMapper.orderList(userid, state);
+ return wrapper.eq(Order::getServerId, userid).list();
}
@Override
public Object orderNavigation(String userPosition, String workerPosition) {
- return GaoDeMapUtil.routing(userPosition, workerPosition);
+ return GaoDeMapUtil.routing(workerPosition, userPosition);
}
}
--
Gitblit v1.7.1