From 3240f801b10a27fa660a4075f5538a0dfc69327c Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 25 八月 2025 11:48:39 +0800 Subject: [PATCH] bug修改 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 1 + ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java index dde905f..8d0f842 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java @@ -170,6 +170,7 @@ tOrderMealGoods.setGoodsName(typeGood.getGoodsName()); tOrderMealGoods.setGoodsPicture(typeGood.getGoodsPicture()); tOrderMealGoods.setGoodsSalePrice(typeGood.getSalePrice()); + tOrderMealGoods.setCostPrice(typeGood.getCostPrice()); tOrderMealGoods.setGoodsCount(1); tOrderMealGoods.setTypeId(typeGood.getTypeId()); tOrderMealGoods.setGoodsId(typeGood.getId()); diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml index a13ac9a..f4c94a4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml @@ -406,6 +406,7 @@ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''"> AND (mealTime BETWEEN #{query.startTime} AND #{query.endTime}) </if> + AND isCover = 1 AND status = 2 AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> -- Gitblit v1.7.1