From d3d2a0ba53cffefd08b633676b9383dd4f9c8a69 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 16:04:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 1 +
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index d269ef0..a1e1094 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -302,6 +302,7 @@
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
+ .ne(Order::getOrderStatus,5)
.eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
.between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
.orderByAsc(Order::getCreateTime));
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 34fa450..669da97 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -100,12 +100,10 @@
SUM( CASE WHEN tor.order_type = 2 THEN tor.total_amount ELSE 0 END ) as singleTotalMoney
FROM
t_order tor where 1 = 1
- <if test="startTime != null and '' != startTime and endTime != null and '' != endTime">
- and tor.create_time between #{startTime} and #{endTime}
- </if>
<if test="null != shopId">
and tor.shop_id = #{shopId}
</if>
+ and tor.order_status!=5
</select>
--
Gitblit v1.7.1