From f34453a6e807103e36e412ecef66b39e9ef1f233 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 19 九月 2024 17:57:39 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 19 +-
ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java | 348 ++++++++++++++++++++++++++-----------------------
ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml | 11 +
ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml | 10
6 files changed, 210 insertions(+), 182 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
index 59e98fc..05184d3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.export.SaleGeneratorListExport;
@@ -28,6 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -63,35 +65,37 @@
Integer roleType = tokenService.getLoginUser().getRoleType();
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.isNull(query.getTimeType())){
- query.setTimeType(1);
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.isNull(query.getTimeType())){
+ query.setTimeType(1);
+ }
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
- LocalDateTime startTime = null;
- LocalDateTime endTime = null;
- switch (query.getTimeType()){
- case 1:
- // 今日
- startTime = DateUtils.getDayStart(LocalDateTime.now());
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 2:
- // 昨日
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
- endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
- break;
- case 3:
- // 近7天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 4:
- // 近30天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- }
- query.setStartTime(DateUtils.localDateTimeToDate(startTime));
- query.setEndTime(DateUtils.localDateTimeToDate(endTime));
SalesVolumeVO salesVolumeVO;
if(roleType == 2){
salesVolumeVO = orderMealService.salesVolume(query);
@@ -106,33 +110,35 @@
public AjaxResult<ProfitDetailsVO> profitDetails(@RequestBody ProfitDetailsQuery query) {
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.nonNull(query.getTimeType())){
- LocalDateTime startTime = null;
- LocalDateTime endTime = null;
- switch (query.getTimeType()){
- case 1:
- // 今日
- startTime = DateUtils.getDayStart(LocalDateTime.now());
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 2:
- // 昨日
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
- endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
- break;
- case 3:
- // 近7天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 4:
- // 近30天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.nonNull(query.getTimeType())){
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
- query.setStartTime(DateUtils.localDateTimeToDate(startTime));
- query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
return AjaxResult.success(orderMealService.profitDetails(query));
}
@@ -142,33 +148,36 @@
public void profitDetailsExport(@RequestBody ProfitDetailsQuery query) {
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.nonNull(query.getTimeType())){
- LocalDateTime startTime = null;
- LocalDateTime endTime = null;
- switch (query.getTimeType()){
- case 1:
- // 今日
- startTime = DateUtils.getDayStart(LocalDateTime.now());
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 2:
- // 昨日
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
- endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
- break;
- case 3:
- // 近7天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 4:
- // 近30天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+
+ if(Objects.nonNull(query.getTimeType())){
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
- query.setStartTime(DateUtils.localDateTimeToDate(startTime));
- query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
List<GoodsProfitVO> list = orderMealService.profitDetailsExport(query);
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), GoodsProfitVO.class, list);
@@ -201,35 +210,37 @@
Integer roleType = tokenService.getLoginUser().getRoleType();
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.isNull(query.getTimeType())){
- query.setTimeType(1);
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.isNull(query.getTimeType())){
+ query.setTimeType(1);
+ }
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
- LocalDateTime startTime = null;
- LocalDateTime endTime = null;
- switch (query.getTimeType()){
- case 1:
- // 今日
- startTime = DateUtils.getDayStart(LocalDateTime.now());
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 2:
- // 昨日
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
- endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
- break;
- case 3:
- // 近7天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 4:
- // 近30天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- }
- query.setStartTime(DateUtils.localDateTimeToDate(startTime));
- query.setEndTime(DateUtils.localDateTimeToDate(endTime));
PageInfo<SalesRankingVO> salesRankingVOS;
if(roleType == 2){
salesRankingVOS = orderMealService.salesRanking(query);
@@ -245,40 +256,46 @@
Integer roleType = tokenService.getLoginUser().getRoleType();
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.isNull(query.getTimeType())){
- query.setTimeType(3);
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+
+ if(Objects.isNull(query.getTimeType())){
+ query.setTimeType(3);
+ }
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
- LocalDateTime startTime = null;
- LocalDateTime endTime = null;
- switch (query.getTimeType()){
- case 1:
- // 今日
- startTime = DateUtils.getDayStart(LocalDateTime.now());
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 2:
- // 昨日
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
- endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
- break;
- case 3:
- // 近7天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 4:
- // 近30天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- }
- query.setStartTime(DateUtils.localDateTimeToDate(startTime));
- query.setEndTime(DateUtils.localDateTimeToDate(endTime));
List<OrderTrendsVO> orderTrendsVOS;
if(roleType == 2){
orderTrendsVOS = orderMealService.orderingTrends(query);
}else{
orderTrendsVOS = orderSaleService.orderingTrends(query);
+ }
+ if (!CollectionUtils.isEmpty(orderTrendsVOS) && Objects.isNull(orderTrendsVOS.get(0).getDayTime())){
+ orderTrendsVOS.get(0).setDayTime(LocalDate.now().toString());
}
return AjaxResult.success(orderTrendsVOS);
}
@@ -288,35 +305,38 @@
public AjaxResult<PersonnelStatisticsAndSumVO> personnelStatistics(@RequestBody TDataStatisticsQuery query) {
Long objectId = tokenService.getLoginUser().getObjectId();
query.setShopId(objectId);
- if(Objects.isNull(query.getTimeType())){
- query.setTimeType(1);
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+
+ if(Objects.isNull(query.getTimeType())){
+ query.setTimeType(1);
+ }
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
}
- LocalDateTime startTime = null;
- LocalDateTime endTime = null;
- switch (query.getTimeType()){
- case 1:
- // 今日
- startTime = DateUtils.getDayStart(LocalDateTime.now());
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 2:
- // 昨日
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
- endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
- break;
- case 3:
- // 近7天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- case 4:
- // 近30天
- startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
- endTime = DateUtils.getDayEnd(LocalDateTime.now());
- break;
- }
- query.setStartTime(DateUtils.localDateTimeToDate(startTime));
- query.setEndTime(DateUtils.localDateTimeToDate(endTime));
PersonnelStatisticsAndSumVO personnelStatisticsAndSumVO = new PersonnelStatisticsAndSumVO();
List<PersonnelStatisticsVO> personnelStatisticsVOS = orderMealService.personnelStatistics(query);
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 d2561a5..eb36fce 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
@@ -91,17 +91,20 @@
long start = System.currentTimeMillis();
// 查询所有的人数用餐标准
List<TFoundationConfigVO> foundationConfigs = foundationConfigService.getList(dto.getShopId());
+ if(CollectionUtils.isEmpty(foundationConfigs)){
+ throw new ServiceException("请先添加该店铺用餐标准");
+ }
// 查询所有桌子
List<TBoard> boards = boardService.list(Wrappers.lambdaQuery(TBoard.class)
.eq(TBoard::getShopId,dto.getShopId()));
if(CollectionUtils.isEmpty(boards)){
- throw new ServiceException("请先添加桌台信息");
+ throw new ServiceException("请先添加该店铺桌台信息");
}
// 查询所有菜品
List<TGoods> goods = goodsService.list(Wrappers.lambdaQuery(TGoods.class)
.eq(TGoods::getShopId,dto.getShopId()));
if(CollectionUtils.isEmpty(goods)){
- throw new ServiceException("请先添加菜品信息");
+ throw new ServiceException("请先添加该店铺菜品信息");
}
// 循环待生成订单列表，添加到集合中，批量插入
List<OrderMealGeneratorCountDTO> orderMealGeneratorCountDTOS = dto.getOrderMealGeneratorCountDTOS();
@@ -151,8 +154,8 @@
});
if(!CollectionUtils.isEmpty(orderMealGoods)){
orderMeal.setMealOrderGoods(orderMealGoods);
- orderMeal.setOrderMoney(orderMealGoods.stream().map(TOrderMealGoods::getGoodsSalePrice).reduce(BigDecimal::add).get());
- orderMeal.setPayMoney(orderMealGoods.stream().map(TOrderMealGoods::getGoodsSalePrice).reduce(BigDecimal::add).get());
+ orderMeal.setOrderMoney(orderMealGoods.stream().map(good->good.getGoodsSalePrice().multiply(new BigDecimal(good.getGoodsCount()))).reduce(BigDecimal::add).get());
+ orderMeal.setPayMoney(orderMealGoods.stream().map(good->good.getGoodsSalePrice().multiply(new BigDecimal(good.getGoodsCount()))).reduce(BigDecimal::add).get());
orderMeals.add(orderMeal);
}
}
@@ -492,15 +495,15 @@
if(dataGenerator.getOrderType() == 1){
// 删除时间段的数据
orderMealService.remove(Wrappers.lambdaQuery(TOrderMeal.class)
- .gt(TOrderMeal::getCreateTime, dataGenerator.getStartTime())
- .lt(TOrderMeal::getCreateTime, dataGenerator.getEndTime()));
+ .gt(TOrderMeal::getMealTime, dataGenerator.getStartTime())
+ .lt(TOrderMeal::getMealTime, dataGenerator.getEndTime()));
// 修改覆盖类型为已覆盖
orderMealService.update(Wrappers.lambdaUpdate(TOrderMeal.class).set(TOrderMeal::getIsCover, 1).eq(TOrderMeal::getGeneratorId, id));
}else {
// 删除时间段的数据
orderStockService.remove(Wrappers.lambdaQuery(TOrderStock.class)
- .gt(TOrderStock::getCreateTime, dataGenerator.getStartTime())
- .lt(TOrderStock::getCreateTime, dataGenerator.getEndTime()));
+ .gt(TOrderStock::getStockTime, dataGenerator.getStartTime())
+ .lt(TOrderStock::getStockTime, dataGenerator.getEndTime()));
// 修改覆盖类型为已覆盖
orderStockService.update(Wrappers.lambdaUpdate(TOrderStock.class).set(TOrderStock::getIsCover, 1).eq(TOrderStock::getGeneratorId, id));
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
index 53d11ed..50fb9e5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
@@ -234,7 +234,7 @@
PageInfo<SalesRankingVO> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
List<TOrderMeal> list = this.list(Wrappers.lambdaQuery(TOrderMeal.class)
.eq(TOrderMeal::getShopId, query.getShopId())
- .between(TOrderMeal::getCreateTime, query.getStartTime(), query.getEndTime()));
+ .between(TOrderMeal::getMealTime, query.getStartTime(), query.getEndTime()));
List<Long> ids = list.stream().map(TOrderMeal::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(ids)){
return new PageInfo<>();
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml
index 14f3e0a..326320d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml
@@ -33,17 +33,19 @@
</where>
</select>
<select id="salesRanking" resultType="com.ruoyi.system.vo.SalesRankingVO">
- SELECT typeName,SUM(goodsSalePrice*goodsCount) AS salesVolume
- from t_order_meal_goods
+ SELECT tomg.typeName,SUM(tomg.goodsSalePrice*goodsCount) AS salesVolume
+ from t_order_meal_goods tomg
+ left join t_order_meal tom on tomg.orderId=tom.id
<where>
<if test="ids != null and ids.size()>0">
- AND orderId IN
+ AND tomg.orderId IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
+ AND tom.isCover = 1
</where>
- GROUP BY typeName
+ GROUP BY tomg.typeName
</select>
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
index 0c6995b..e1a1a7e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
@@ -107,6 +107,7 @@
AND (mealTime BETWEEN #{query.startTime} AND #{query.endTime})
</if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ AND isCover = 1
</where>
</select>
<select id="exportOrderMeal" resultType="com.ruoyi.system.vo.TOrderMealVO">
@@ -140,7 +141,7 @@
</select>
<select id="orderingTrends" resultType="com.ruoyi.system.vo.OrderTrendsVO">
select
- DATE_FORMAT(createTime, '%Y-%m-%d') AS dayTime,
+ DATE_FORMAT(mealTime, '%Y-%m-%d') AS dayTime,
COUNT(id) AS orderCount
from t_order_meal
<where>
@@ -148,14 +149,15 @@
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()}
+ AND isCover = 1
</where>
</select>
<select id="personnelStatistics" resultType="com.ruoyi.system.vo.PersonnelStatisticsVO">
select
- tb.boardName,tom.mealPerson, (tom.payMoney/tom.mealPerson) AS avgAmount
+ tb.boardName,tom.mealPerson AS personCount, ROUND((tom.payMoney/tom.mealPerson),2) AS avgAmount
from t_order_meal tom
left join t_board tb on tb.id = tom.boardId
<where>
@@ -163,9 +165,10 @@
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="pageListGenerator" resultType="com.ruoyi.system.vo.TOrderMealVO">
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml
index 7c615fa..8f972a6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml
@@ -90,7 +90,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 (orderTime BETWEEN #{query.startTime} AND #{query.endTime})
</if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
--
Gitblit v1.7.1