From 20cd42287efb95254ea788ce2b6d0c559e378e04 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 19 九月 2024 14:36:21 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
index 8e33141..0c6995b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
@@ -53,18 +53,19 @@
and tom.shopId = #{query.shopId}
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
- AND (tom.createTime BETWEEN #{query.startTime} AND #{query.endTime})
+ AND (tom.mealTime BETWEEN #{query.startTime} AND #{query.endTime})
</if>
AND tom.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ AND tom.isCover = 1
</where>
- ORDER BY tom.createTime DESC
+ ORDER BY tom.mealTime DESC
</select>
<select id="amountSum" resultType="com.ruoyi.system.vo.AmountSumVO">
select
COUNT(tom.id) AS orderCount,
- SUM(tom.orderMoney) AS saleAmount,
- SUM(tom.payMoney) AS payAmount,
- SUM(tom.orderMoney - tom.payMoney) AS obligation
+ IFNULL(SUM(tom.orderMoney),0) AS saleAmount,
+ IFNULL(SUM(tom.payMoney),0) AS payAmount,
+ IFNULL(SUM(tom.orderMoney - tom.payMoney),0) AS obligation
from t_order_meal tom
left join t_board tb on tb.id = tom.boardId
<where>
@@ -78,15 +79,16 @@
and tom.status = #{query.status}
</if>
<if test="query.orderNum != null and query.orderNum">
- and tom.orderNum LIKE concat('%',#{query.status},'%')
+ and tom.orderNum LIKE concat('%',#{query.orderNum},'%')
</if>
<if test="query.shopId != null">
and tom.shopId = #{query.shopId}
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
- AND (tom.createTime BETWEEN #{query.startTime} AND #{query.endTime})
+ AND (tom.mealTime BETWEEN #{query.startTime} AND #{query.endTime})
</if>
AND tom.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ AND tom.isCover = 1
</where>
</select>
<select id="salesVolume" resultType="com.ruoyi.system.vo.SalesVolumeVO">
@@ -102,7 +104,7 @@
and shopId = #{query.shopId}
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
- AND (createTime BETWEEN #{query.startTime} AND #{query.endTime})
+ AND (mealTime BETWEEN #{query.startTime} AND #{query.endTime})
</if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
--
Gitblit v1.7.1