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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-11-26 10:53:35 +08:00
parent 3127281b50 ed865240c2
commit 717276c0df
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/order-server/src/main/java/com/czg/handel/ExcelMergeHandler.java
View File

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

1
cash-service/order-service/src/main/resources/mapper/ShopTableOrderStatisticMapper.xml
View File

@@ -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
</select>
</mapper>