修改接口

xuhy

2024-09-27 d0f8732a1e4c275301b53c49ee8f00727651491e

 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,7 +77,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));
    }
@@ -93,6 +94,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);
    }

@@ -139,16 +148,18 @@
    @PostMapping("/exportOrderSale")
    public void exportOrderSale(@RequestBody TOrderMealQuery query)
    {
        query.setShopId(tokenService.getLoginUser().getObjectId());
        List<TOrderSaleVO> list = orderSaleService.exportOrderSale(query);
        List<TOrderMealExportExcel> orderMeals = new ArrayList<>();
        List<TOrderSaleExportExcel> orderMeals = new ArrayList<>();
        for (TOrderSaleVO orderSaleVO : list) {
            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(), TOrderMealExportExcel.class, orderMeals);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOrderSaleExportExcel.class, orderMeals);
        HttpServletResponse response = WebUtils.response();
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");