From 4d059a2f8495e3b5d732a3446bcd28f866304923 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 22 Apr 2026 10:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ShopProdStatisticMapper.xml   | 6 +++---
 .../product/service/impl/ConsStockFlowServiceImpl.java      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 b3b115a4d..1e7ae8838 100644
--- a/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
@@ -84,8 +84,8 @@
         SELECT
         sum(detail.num-detail.return_num) as saleCount,
         sum(detail.pay_amount) as totalAmount,
-        sum(detail.refund_num) refundCount,
-        sum(detail.return_amount) refundAmount
+        sum(detail.refund_num) as refundCount,
+        sum(detail.return_amount) as refundAmount
         FROM
         tb_order_info `order`
         INNER JOIN tb_order_detail detail ON `order`.id = detail.order_id
@@ -104,7 +104,7 @@
     <select id="summaryCountSingleDate" resultType="com.czg.order.vo.SaleSummaryCountVo">
         SELECT
         sum(statistic.sale_count) AS saleCount,
-        sum(statistic.sale_amount) AS saleAmount,
+        sum(statistic.sale_amount) AS totalAmount,
         sum(statistic.refund_count) AS refundCount,
         sum(statistic.refund_amount) AS refundAmount
         FROM
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
index 8d6f34706..742b904df 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
@@ -158,7 +158,6 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
         stockPrint.setPrintTime(LocalDateTime.now());
         stockPrint.setInStockTime(LocalDateTime.now());
         stockPrint.setOperator(param.getOperator());
-        stockPrint.setConsCount(param.getBodyList().size());
         List<StockPrintDTO.InStockItem> items = new ArrayList<>();
         BigDecimal totalInOutNumber = BigDecimal.ZERO;
         BigDecimal totalAmount = BigDecimal.ZERO;
@@ -175,6 +174,7 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
             totalInOutNumber = NumberUtil.add(totalInOutNumber, cons.getInOutNumber());
             totalAmount = NumberUtil.add(totalAmount, cons.getSubTotal());
         }
+        stockPrint.setConsCount(items.size());
         stockPrint.setStockNumberCount(totalInOutNumber);
         stockPrint.setAmountCount(totalAmount);
         stockPrint.setItems(items);