bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:a5619f5300987e8bf315308b30bd7912b14e6e2a
Branches Tags
bonus:master
bonus:jiankang
bonus:newcode0420
bonus:test417
bonus:menutype0415
bonus:beforemenu
bonus:pay0408
bonus:balance0407
bonus:pay0406
..
compare: bonus:8a939b61a44eddeaabec7f4e64750367415a2bca
Branches Tags
bonus:master
bonus:jiankang
bonus:newcode0420
bonus:test417
bonus:menutype0415
bonus:beforemenu
bonus:pay0408
bonus:balance0407
bonus:pay0406

No commits in common. "a5619f5300987e8bf315308b30bd7912b14e6e2a" and "8a939b61a44eddeaabec7f4e64750367415a2bca" have entirely different histories.
a5619f5300 ... 8a939b61a4

1 changed files with 1 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
View File

@ -322,7 +322,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
inner join sys_dept sd on inner join sys_dept sd on
su.dept_id = sd.dept_id su.dept_id = sd.dept_id
where where
atwd.trade_type in (110, 120, 130) atwd.trade_type in (110, 130)
and oi.order_state in (1, 2, 3) and oi.order_state in (1, 2, 3)
and oi.pay_state = 3 and oi.pay_state = 3
<if test="param.tradeType != null"> <if test="param.tradeType != null">