From d7efbb2b6bae17334c3f8dbdb706813e1ad738b5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 十二月 2024 11:26:19 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 bdbf384..79124a6 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
@@ -13,7 +13,6 @@
import com.ruoyi.system.domain.TOrderSaleGoods;
import com.ruoyi.system.dto.CheckoutDTO;
import com.ruoyi.system.dto.TOrderSaleDTO;
-import com.ruoyi.system.export.TOrderMealExportExcel;
import com.ruoyi.system.export.TOrderSaleExportExcel;
import com.ruoyi.system.query.TOrderMealQuery;
import com.ruoyi.system.query.TOrderSaleQuery;
@@ -79,7 +78,6 @@
@PostMapping(value = "/amountSum")
public AjaxResult<AmountSumVO> amountSum(@RequestBody TOrderSaleQuery query) {
query.setShopId(tokenService.getLoginUser().getObjectId());
- orderSaleService.amountSum(query);
return AjaxResult.success(orderSaleService.amountSum(query));
}
@@ -156,8 +154,8 @@
TOrderSaleExportExcel orderSaleExportExcel = new TOrderSaleExportExcel();
BeanUtils.copyProperties(orderSaleVO, orderSaleExportExcel);
orderSaleExportExcel.setCreateStrTime(DateUtils.localDateTimeToString(orderSaleVO.getCreateTime()));
- orderSaleExportExcel.setGoodsAmount(orderSaleVO.getOrderSaleGoods().stream().map(TOrderSaleGoods::getThisSalePrice).reduce(BigDecimal::add).get());
- orderSaleExportExcel.setGoodsCount(orderSaleVO.getOrderSaleGoods().size());
+ orderSaleExportExcel.setGoodsAmount(orderSaleVO.getGoodsAmount());
+ orderSaleExportExcel.setGoodsCount(orderSaleVO.getGoodsCount());
orderMeals.add(orderSaleExportExcel);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderSaleExportExcel.class, orderMeals);
--
Gitblit v1.7.1