czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据统计

Browse Source
This commit is contained in:
Tankaikai
2025-03-19 11:26:47 +08:00
parent aed4034757
commit 778cac8839
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
View File

@@ -126,6 +126,10 @@ public class ShopOrderStatistic implements Serializable {
* 充值金额
*/
private BigDecimal rechargeAmount = BigDecimal.ZERO;
/**
* 充值退款金额
*/
private BigDecimal rechargeRefundAmount = BigDecimal.ZERO;
/**
* 客单价
*/

4
cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
View File

@@ -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;

4
cash-common/cash-common-service/src/main/java/com/czg/order/param/SaleSummaryCountParam.java
View File

@@ -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;
}

4
cash-common/cash-common-service/src/main/java/com/czg/order/param/TableSummaryParam.java
View File

@@ -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;
/**

2
cash-common/cash-common-service/src/main/java/com/czg/order/vo/TableSummaryInfoVo.java
View File

@@ -19,7 +19,7 @@ import java.math.BigDecimal;
*/
@NoArgsConstructor
@Data
@ColumnWidth(30)
@ColumnWidth(20)
public class TableSummaryInfoVo implements Serializable {
@Serial

1
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java
View File

@@ -83,6 +83,7 @@ public class DataSummaryServiceImpl implements DataSummaryService {
Map<String, BigDecimal> sum1 = list1.stream().collect(Collectors.toMap(item -> Convert.toStr(item.get("bizCode")), item -> Convert.toBigDecimal(item.get("amount"))));
Map<String, Long> 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()));