From 778cac8839d70886dcf69b3a0aa9f0f7308151ef Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Wed, 19 Mar 2025 11:26:47 +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 --- .../main/java/com/czg/order/entity/ShopOrderStatistic.java | 4 ++++ .../main/java/com/czg/order/param/DataSummaryTradeParam.java | 4 ++-- .../main/java/com/czg/order/param/SaleSummaryCountParam.java | 4 ++-- .../src/main/java/com/czg/order/param/TableSummaryParam.java | 4 ++-- .../src/main/java/com/czg/order/vo/TableSummaryInfoVo.java | 2 +- .../service/order/service/impl/DataSummaryServiceImpl.java | 1 + 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java index ef79ef2f7..1b6f44da3 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java @@ -126,6 +126,10 @@ public class ShopOrderStatistic implements Serializable { * 充值金额 */ private BigDecimal rechargeAmount = BigDecimal.ZERO; + /** + * 充值退款金额 + */ + private BigDecimal rechargeRefundAmount = BigDecimal.ZERO; /** * 客单价 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java index e2199ebc6..3b71ed0fe 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java @@ -21,12 +21,12 @@ public class DataSummaryTradeParam implements Serializable { private static final long serialVersionUID = 1L; /** - * 开始时间 格式：yyyy-MM-dd + * 开始时间 格式：yyyy-MM-dd HH:mm:ss */ @NotBlank(message = "开始日期不能为空", groups = DefaultGroup.class) private String beginDate; /** - * 结束时间 格式：yyyy-MM-dd + * 结束时间 格式：yyyy-MM-dd HH:mm:ss */ @NotBlank(message = "结束日期不能为空", groups = DefaultGroup.class) private String endDate; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java index 0b25ebcc3..f64ae7f87 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java @@ -31,11 +31,11 @@ public class SaleSummaryCountParam implements Serializable { */ private Long prodCategoryId; /** - * 开始日期 格式：yyyy-MM-dd + * 开始日期 格式：yyyy-MM-dd HH:mm:ss */ private String beginDate; /** - * 结束日期 格式：yyyy-MM-dd + * 结束日期 格式：yyyy-MM-dd HH:mm:ss */ private String endDate; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/TableSummaryParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/TableSummaryParam.java index bba6749fe..54c618db8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/TableSummaryParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/TableSummaryParam.java @@ -19,11 +19,11 @@ public class TableSummaryParam implements Serializable { private static final long serialVersionUID = 1L; /** - * 开始时间 格式：yyyy-MM-dd + * 开始时间 格式：yyyy-MM-dd HH:mm:ss */ private String beginDate; /** - * 结束时间 格式：yyyy-MM-dd + * 结束时间 格式：yyyy-MM-dd HH:mm:ss */ private String endDate; /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java index 620ae81cf..13960fd1c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; */ @NoArgsConstructor @Data -@ColumnWidth(30) +@ColumnWidth(20) public class TableSummaryInfoVo implements Serializable { @Serial diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java index 14c7747de..73c9728b3 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java @@ -83,6 +83,7 @@ public class DataSummaryServiceImpl implements DataSummaryService { Map sum1 = list1.stream().collect(Collectors.toMap(item -> Convert.toStr(item.get("bizCode")), item -> Convert.toBigDecimal(item.get("amount")))); Map count1 = list1.stream().collect(Collectors.toMap(item -> Convert.toStr(item.get("bizCode")), item -> Convert.toLong(item.get("count")))); data.setRechargeAmount(NumberUtil.add(sum1.getOrDefault("cashIn", BigDecimal.ZERO), sum1.getOrDefault("wechatIn", BigDecimal.ZERO), sum1.getOrDefault("alipayIn", BigDecimal.ZERO))); + data.setRechargeRefundAmount(sum1.getOrDefault("rechargeRefund", BigDecimal.ZERO).abs()); data.setMemberPayAmount(sum1.getOrDefault("orderPay", BigDecimal.ZERO).abs()); data.setMemberPayCount(count1.getOrDefault("orderPay", 0L)); data.setSaleAmount(NumberUtil.add(data.getWechatPayAmount(), data.getAliPayAmount(), data.getScanPayAmount(), data.getCashPayAmount(), data.getCreditPayAmount()));