angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:c7cb018ca1c4811fbb3ab9545ecba2c4451045cf
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
..
compare: angelo:c274fba09e49c73139c2bb14281a0f2654800ef9
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
angelo:master

No commits in common. "c7cb018ca1c4811fbb3ab9545ecba2c4451045cf" and "c274fba09e49c73139c2bb14281a0f2654800ef9" have entirely different histories.
c7cb018ca1 ... c274fba09e

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

4
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
View File

@ -215,7 +215,7 @@
and soi.del_flag = 0 and soi.del_flag = 0
and soi.is_gift = 1 and soi.is_gift = 1
where so.order_status = 1 where so.order_status = 1
and so.order_type in (43, 44) and so.order_type in (43)
<if test="orderCode != null and orderCode != ''"> <if test="orderCode != null and orderCode != ''">
and so.order_code=#{orderCode} and so.order_code=#{orderCode}
</if> </if>
@ -228,7 +228,7 @@
on bw.pk_id = soi.pk_wares on bw.pk_id = soi.pk_wares
and bw.del_flag = 0 and bw.del_flag = 0
where so.order_status = 1 where so.order_status = 1
and so.order_type in (43, 44) and so.order_type in (43)
<if test="orderCode != null and orderCode != ''"> <if test="orderCode != null and orderCode != ''">
and so.order_code=#{orderCode} and so.order_code=#{orderCode}
</if> </if>