Merge remote-tracking branch 'origin/master'

增加补扣
2025-05-16 16:32:34 +08:00 · 2025-05-16 16:32:20 +08:00
1 changed files with 1 additions and 1 deletions
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
@ -322,7 +322,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                inner join sys_dept sd on
                su.dept_id = sd.dept_id
        where
-            atwd.trade_type in (110, 130)
+            atwd.trade_type in (110, 120, 130)
          and oi.order_state in (1, 2, 3)
          and oi.pay_state = 3
        <if test="param.tradeType != null">
Author	SHA1	Message	Date
gaowdong	a5619f5300	Merge remote-tracking branch 'origin/master'	2025-05-16 16:32:34 +08:00
gaowdong	4cd1a8f751	增加补扣	2025-05-16 16:32:20 +08:00