From aef811660660ea2dbab4d5642b2aebedf384d2f0 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Wed, 12 Mar 2025 10:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/SaleSummaryController.java | 4 ++ .../com/czg/order/vo/SaleSummaryCountVo.java | 2 +- .../com/czg/order/vo/SaleSummaryExportVo.java | 2 + .../com/czg/order/vo/SaleSummaryInfoVo.java | 49 ++++++++++++------- .../czg/order/vo/TableSummaryExportVo.java | 2 + .../order/mapper/ShopProdStatisticMapper.java | 3 ++ .../service/impl/SaleSummaryServiceImpl.java | 12 +++-- .../mapper/ShopProdStatisticMapper.xml | 31 ++++++++++++ 8 files changed, 80 insertions(+), 25 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java index 15339a09..15fe88af 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java @@ -10,6 +10,7 @@ import com.czg.sa.StpKit; import com.mybatisflex.core.paginate.Page; import com.pig4cloud.plugin.excel.annotation.ResponseExcel; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -22,6 +23,7 @@ import java.util.List; * @author tankaikai * @since 2025-03-07 15:25 */ +@Slf4j @AllArgsConstructor @RestController @RequestMapping("/admin/sale/summary") @@ -62,6 +64,8 @@ public class SaleSummaryController { @OperationLog("导出") //@SaAdminCheckPermission("saleSummary:export") public List summaryExport(SaleSummaryCountParam param) { + Long shopId = StpKit.USER.getShopId(0L); + param.setShopId(shopId); return saleSummaryService.summaryList(param); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java index 7a52e385..8632a3a8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryCountVo.java @@ -32,5 +32,5 @@ public class SaleSummaryCountVo implements Serializable { /** * 退单量 */ - private Integer refundCount = 0; + private BigDecimal refundCount = BigDecimal.ZERO; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryExportVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryExportVo.java index 54afdd51..b793e44a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryExportVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryExportVo.java @@ -2,6 +2,7 @@ package com.czg.order.vo; import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.write.style.ColumnWidth; import com.alibaba.fastjson2.annotation.JSONField; import com.pig4cloud.plugin.excel.annotation.ExcelLine; import lombok.Data; @@ -17,6 +18,7 @@ import java.math.BigDecimal; * @since 2025-03-07 16:22 */ @Data +@ColumnWidth(30) public class SaleSummaryExportVo implements Serializable { @Serial diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryInfoVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryInfoVo.java index 24f3c395..5781a06e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryInfoVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/SaleSummaryInfoVo.java @@ -1,10 +1,16 @@ package com.czg.order.vo; +import cn.idev.excel.annotation.ExcelIgnore; +import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.write.style.ColumnWidth; +import com.alibaba.fastjson2.annotation.JSONField; +import com.pig4cloud.plugin.excel.annotation.ExcelLine; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; +import java.math.BigDecimal; /** * 销量统计明细 @@ -13,42 +19,47 @@ import java.io.Serializable; */ @NoArgsConstructor @Data +@ColumnWidth(30) public class SaleSummaryInfoVo implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * cateName + * 导入时候回显行号 */ - private String cateName; + @ExcelLine + @ExcelIgnore + @JSONField(serialize = false) + private Long lineNum; /** - * name + * 商品分类 */ - private String name; + @ExcelProperty("商品分类") + private String categoryName; /** - * productId + * 商品名称 */ - private Integer productId; + @ExcelProperty("商品名称") + private String productName; /** - * refAmount + * 销量 */ - private Integer refAmount; + @ExcelProperty("销量") + private BigDecimal saleCount; /** - * refNum + * 销售金额 */ - private Integer refNum; + @ExcelProperty("销售金额") + private BigDecimal saleAmount; /** - * salesAmount + * 退单量 */ - private Integer salesAmount; + @ExcelProperty("退单量") + private BigDecimal refundCount; /** - * salesNum + * 退单金额 */ - private Integer salesNum; - /** - * typeEnum - */ - private String typeEnum; + @ExcelProperty("退单金额") + private BigDecimal refundAmount; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryExportVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryExportVo.java index 36a1387f..79418572 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryExportVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryExportVo.java @@ -2,6 +2,7 @@ package com.czg.order.vo; import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.write.style.ColumnWidth; import com.alibaba.fastjson2.annotation.JSONField; import com.pig4cloud.plugin.excel.annotation.ExcelLine; import lombok.Data; @@ -17,6 +18,7 @@ import java.math.BigDecimal; * @since 2025-03-07 16:22 */ @Data +@ColumnWidth(30) public class TableSummaryExportVo implements Serializable { @Serial diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopProdStatisticMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopProdStatisticMapper.java index 28bc8bc4..f857ebe8 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopProdStatisticMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopProdStatisticMapper.java @@ -5,6 +5,7 @@ import com.czg.order.param.DataSummaryProductSaleParam; import com.czg.order.param.SaleSummaryCountParam; import com.czg.order.vo.DataSummaryProductSaleRankingVo; import com.czg.order.vo.SaleSummaryCountVo; +import com.czg.order.vo.SaleSummaryInfoVo; import com.mybatisflex.core.BaseMapper; import java.util.List; @@ -21,4 +22,6 @@ public interface ShopProdStatisticMapper extends BaseMapper { SaleSummaryCountVo getSaleSummaryCount(SaleSummaryCountParam param); + List findSaleSummaryList(SaleSummaryCountParam param); + } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/SaleSummaryServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/SaleSummaryServiceImpl.java index 08923586..e8c62aa6 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/SaleSummaryServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/SaleSummaryServiceImpl.java @@ -5,11 +5,13 @@ import com.czg.order.service.SaleSummaryService; import com.czg.order.vo.SaleSummaryCountVo; import com.czg.order.vo.SaleSummaryInfoVo; import com.czg.service.order.mapper.ShopProdStatisticMapper; +import com.czg.utils.PageUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /** @@ -34,13 +36,13 @@ public class SaleSummaryServiceImpl implements SaleSummaryService { @Override public Page summaryPage(SaleSummaryCountParam param) { - Page page = new Page<>(); - page.setRecords(new ArrayList()); - return page; + PageHelper.startPage(PageUtil.buildPageHelp()); + PageInfo pageInfo = new PageInfo<>(shopProdStatisticMapper.findSaleSummaryList(param)); + return PageUtil.convert(pageInfo); } @Override public List summaryList(SaleSummaryCountParam param) { - return List.of(); + return shopProdStatisticMapper.findSaleSummaryList(param); } } diff --git a/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml index 9b3bc55b..af18069e 100644 --- a/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml @@ -43,4 +43,35 @@ ]]> +