From 29681c0ae2784a74796fe2f15f8ec69f967a3436 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Apr 2026 16:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=80=BB=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/account/dto/HandoverRecordDTO.java | 4 ++++ .../src/main/java/com/czg/account/entity/HandoverRecord.java | 4 ++++ .../src/main/java/com/czg/account/vo/HandoverTotalVo.java | 4 ++++ .../account/service/impl/HandoverRecordServiceImpl.java | 1 + .../java/com/czg/service/market/mapper/OrderInfoMapper.java | 2 +- .../main/java/com/czg/service/order/print/PrinterImpl.java | 2 +- 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/HandoverRecordDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/HandoverRecordDTO.java index 322b47ddd..8295d28aa 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/HandoverRecordDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/HandoverRecordDTO.java @@ -58,6 +58,10 @@ public class HandoverRecordDTO implements Serializable { * 营业额 */ private BigDecimal turnover; + /** + * 订单额 + */ + private BigDecimal orderTurnover; /** * 现金收款 cash_pay diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/HandoverRecord.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/HandoverRecord.java index 2674781cb..92bd3bb0e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/HandoverRecord.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/HandoverRecord.java @@ -58,6 +58,10 @@ public class HandoverRecord implements Serializable { * 营业额 */ private BigDecimal turnover; + /** + * 订单额 + */ + private BigDecimal orderTurnover; /** * 现金收款 cash_pay diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverTotalVo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverTotalVo.java index 1f213e5b5..a8aeb7493 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverTotalVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/HandoverTotalVo.java @@ -58,6 +58,10 @@ public class HandoverTotalVo implements Serializable { * 营业额 */ private BigDecimal turnover; + /** + * 订单额 + */ + private BigDecimal orderTurnover; /** * 现金收款 cash_pay diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java index 77e0dbf3e..6ee7104dc 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java @@ -93,6 +93,7 @@ public class HandoverRecordServiceImpl extends ServiceImpl { * 订单支付方式统计 当日实时数据 */ @Select("SELECT" + - " SUM(tb_order_info.pay_amount) AS turnover," + + " SUM(tb_order_info.pay_amount) AS orderTurnover," + " SUM(CASE WHEN pay_type = 'main_scan' THEN pay_amount ELSE 0 END) AS selfScan," + " SUM(CASE WHEN pay_type = 'back_scan' THEN pay_amount ELSE 0 END) AS barScan," + " SUM(CASE WHEN pay_type = 'wechat_mini' THEN pay_amount ELSE 0 END) AS wechat," + diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java index 248cd2a03..b0195bd14 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java @@ -205,7 +205,7 @@ public interface PrinterImpl { .append(getFormatLabel(leftRightAlign(" 退款金额:", handoverRecord.getRefundAmount().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br) .append(getFormatLabel(leftRightAlign(" 退菜数量:", handoverRecord.getReturnDishCount().toString(), 32), signLabelInfo.s)).append(signLabelInfo.br) .append(getFormatLabel("--------------------------------", signLabelInfo.s)).append(signLabelInfo.br) - .append(getFormatLabel(leftRightAlign("订单（数量/订单总额）", handoverRecord.getOrderCount() + "/" + handoverRecord.getTurnover(), 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign("订单数量/订单总额", handoverRecord.getOrderCount() + "/" + handoverRecord.getOrderTurnover(), 32), signLabelInfo.s)).append(signLabelInfo.br) .append(getFormatLabel("----------- 销售数据 -----------", signLabelInfo.s)).append(signLabelInfo.br) .append(getFormatLabel(formatItemLine("商品分类", "数量", "总计", 14, 8), signLabelInfo.s)) .append(signLabelInfo.br);