From ae4c93dd2e2aef79332360fb5dec13c5b2c961f3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 九月 2024 18:36:07 +0800
Subject: [PATCH] 修改接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
index d5fb8e3..bdbf384 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
@@ -68,6 +68,7 @@
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TOrderSaleVO>> pageList(@RequestBody TOrderSaleQuery query) {
query.setShopId(tokenService.getLoginUser().getObjectId());
+ query.setIsCover(1);
return AjaxResult.success(orderSaleService.pageList(query));
}
@@ -76,8 +77,9 @@
*/
@ApiOperation( value = "查询销售金额统计")
@PostMapping(value = "/amountSum")
- public AjaxResult<AmountSumVO> amountSum(@RequestBody TOrderMealQuery query) {
+ public AjaxResult<AmountSumVO> amountSum(@RequestBody TOrderSaleQuery query) {
query.setShopId(tokenService.getLoginUser().getObjectId());
+ orderSaleService.amountSum(query);
return AjaxResult.success(orderSaleService.amountSum(query));
}
@@ -93,6 +95,14 @@
List<TOrderSaleGoods> list = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
.eq(TOrderSaleGoods::getOrderId, orderSale.getId()));
orderSaleVO.setOrderSaleGoods(list);
+ BigDecimal sum = BigDecimal.ZERO;
+ Integer count = 0;
+ for (TOrderSaleGoods tOrderSaleGoods : list) {
+ sum = sum.add(tOrderSaleGoods.getThisSalePrice().multiply(new BigDecimal(tOrderSaleGoods.getGoodsCount())));
+ count = count + tOrderSaleGoods.getGoodsCount();
+ }
+ orderSaleVO.setGoodsAmount(sum);
+ orderSaleVO.setGoodsCount(count);
return AjaxResult.success(orderSaleVO);
}
--
Gitblit v1.7.1