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