From d3988037488946f8c5a85ba7e81f1dc13d7d2c0b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 26 Nov 2025 10:49:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopTableOrderStatisticMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/cash-service/order-service/src/main/resources/mapper/ShopTableOrderStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopTableOrderStatisticMapper.xml index d0a45d20d..76ad1c70d 100644 --- a/cash-service/order-service/src/main/resources/mapper/ShopTableOrderStatisticMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/ShopTableOrderStatisticMapper.xml @@ -34,5 +34,6 @@ AND `order`.trade_day >= #{beginDate} AND `order`.trade_day <= #{endDate} group by `order`.trade_day, `order`.table_code, detail.product_id, detail.sku_id + order by `order`.trade_day, `order`.table_code, detail.product_id From ed865240c2520ce4d0618f111ab3ba2cc511c254 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 26 Nov 2025 10:52:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=20=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/handel/ExcelMergeHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-api/order-server/src/main/java/com/czg/handel/ExcelMergeHandler.java b/cash-api/order-server/src/main/java/com/czg/handel/ExcelMergeHandler.java index d618ab3bd..3106f5813 100644 --- a/cash-api/order-server/src/main/java/com/czg/handel/ExcelMergeHandler.java +++ b/cash-api/order-server/src/main/java/com/czg/handel/ExcelMergeHandler.java @@ -17,7 +17,7 @@ import java.util.List; */ public class ExcelMergeHandler implements CellWriteHandler { // 要合并的列索引数组 - private int[] mergeColumnIndex = {0, 1, 2, 8, 9}; + private int[] mergeColumnIndex = {0, 1, 2, 3, 8, 9}; // 合并开始的行索引 private int mergeRowIndex = 1;