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

## Opt - 首页统计订单类型
2025-08-21 10:45:58 +08:00 · 2025-08-21 10:45:52 +08:00
1 changed files with 2 additions and 2 deletions
--- a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
+++ b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml
@ -156,7 +156,7 @@
              from sa_order so
              where so.del_flag = 0
                and so.order_status = 1
-                and so.order_type in (1, 2, 24, 25)
+                and so.order_type in (41, 42)
                and to_char(so.pay_time, 'yyyy-mm') = to_char(sysdate, 'yyyy-mm')
             ) a
                 left join (
@ -165,7 +165,7 @@
            from sa_order so
            where so.del_flag = 0
              and so.order_status = 1
-              and so.order_type in (3, 26, 10)
+              and so.order_type in (43, 44)
              and to_char(so.pay_time, 'yyyy-mm') =
                  to_char(sysdate, 'yyyy-mm')
        ) b on 1 = 1
Author	SHA1	Message	Date
sangelxiu1	4273dfe2c1	Merge remote-tracking branch 'origin/dev' into dev	2025-08-21 10:45:58 +08:00
sangelxiu1	e818ed7bc6	## Opt - 首页统计订单类型	2025-08-21 10:45:52 +08:00