生成数据明细导出修改

xuhy

2024-11-30 bfdb3faf4f27df01718f58ac8c4ec0bcc092e7b6

 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;
@@ -77,7 +76,7 @@
     */
    @ApiOperation( value = "查询销售金额统计")
    @PostMapping(value = "/amountSum")
    public AjaxResult<AmountSumVO> amountSum(@RequestBody TOrderMealQuery query) {
    public AjaxResult<AmountSumVO> amountSum(@RequestBody TOrderSaleQuery query) {
        query.setShopId(tokenService.getLoginUser().getObjectId());
        return AjaxResult.success(orderSaleService.amountSum(query));
    }
@@ -94,6 +93,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);
    }

@@ -147,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);